← Back to branch summary

~ubuntu-branches/ubuntu/hardy/ffmpeg/hardy

« back to all changes in this revision

Viewing changes to libavformat/nuv.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2006-08-23 14:35:52 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20060823143552-8fxnur5b9gesr03m
Tags: 3:0.cvs20060823-0ubuntu1
* Sync with Debian:
  + Add the epoch again

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/nuv.c
17
17
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
18
 */
19
19
#include "avformat.h"
20
 
#include "avi.h"
 
20
#include "riff.h"
21
21
 
22
22
typedef struct {
23
23
    int v_id;
65
65
                subtype = get_byte(pb);
66
66
                url_fskip(pb, 6);
67
67
                size = PKTSIZE(get_le32(pb));
68
 
                if (subtype == 'R') {
 
68
                if (vst && subtype == 'R') {
69
69
                    vst->codec->extradata_size = size;
70
70
                    vst->codec->extradata = av_malloc(size);
71
71
                    get_buffer(pb, vst->codec->extradata, size);
186
186
    while (!url_feof(pb)) {
187
187
        ret = get_buffer(pb, hdr, HDRSIZE);
188
188
        if (ret <= 0)
189
 
            return ret;
 
189
            return ret ? ret : -1;
190
190
        frametype = hdr[0];
191
191
        size = PKTSIZE(LE_32(&hdr[8]));
192
192
        switch (frametype) {
227
227
    return AVERROR_IO;
228
228
}
229
229
 
230
 
static AVInputFormat nuv_iformat = {
 
230
AVInputFormat nuv_demuxer = {
231
231
    "nuv",
232
232
    "NuppelVideo format",
233
233
    sizeof(NUVContext),
237
237
    NULL,
238
238
    NULL,
239
239
};
240
 
 
241
 
int nuv_init(void) {
242
 
    av_register_input_format(&nuv_iformat);
243
 
    return 0;
244
 
}
245