diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-29 00:20:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-29 00:20:29 +0100 |
| commit | 4dcd1a3145dd93602b86a44ebc07d98ca2a30ab6 (patch) | |
| tree | 694f5d2cba955bc53de20f8fb81cb54439ae5279 /libavformat/rsodec.c | |
| parent | 4b03d960220d15cb915c2c8f15970d2f36f25cd9 (diff) | |
| parent | ac47e014bbaf5163871a8beb7522015e0bc27615 (diff) | |
| download | ffmpeg-4dcd1a3145dd93602b86a44ebc07d98ca2a30ab6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
adtsenc: Check frame size.
txd: Fix order of operations.
APIchanges: fill in some blanks
timer: fix misspelling of "decicycles"
Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.
indeo3: cosmetics
md5proto: Fix order of operations.
dca: Replace oversized unused get_bits() with skip_bits_long().
Conflicts:
doc/APIchanges
libavformat/mmsh.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rsodec.c')
| -rw-r--r-- | libavformat/rsodec.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c index 14adc04b4b..0888eca217 100644 --- a/libavformat/rsodec.c +++ b/libavformat/rsodec.c @@ -92,11 +92,8 @@ AVInputFormat ff_rso_demuxer = { .name = "rso", .long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"), .extensions = "rso", - .priv_data_size = 0, - .read_probe = NULL, /* no magic value in this format */ .read_header = rso_read_header, .read_packet = rso_read_packet, - .read_close = NULL, .read_seek = pcm_read_seek, .codec_tag = (const AVCodecTag* const []){ff_codec_rso_tags, 0}, }; |