summaryrefslogtreecommitdiff
path: root/libavformat/ivfdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-07-17 19:52:05 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-07-17 20:12:02 +0200
commit78accb876c173c881082018b169b5cf9fa13e6e1 (patch)
tree5dbcaf2ae14a012dafaaf418a650d697f3ef8ea4 /libavformat/ivfdec.c
parentfc096e2e861e821a743bf9c42abee0fb41fff5d6 (diff)
parent08e09ed7db732ebc53b8c60d7a39ac0abd49694f (diff)
downloadffmpeg-78accb876c173c881082018b169b5cf9fa13e6e1.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: ffmpeg: fix some indentation ffmpeg: fix operation with --disable-avfilter simple_idct: remove disabled code motion_est: remove disabled code vc1: remove disabled code fate: separate lavf-mxf_d10 test from lavf-mxf cabac: Move code only used in the cabac test program to cabac.c. ffplay: warn that -pix_fmt is no longer working, suggest alternative ffplay: warn that -s is no longer working, suggest alternative lavf: rename enc variable in utils.c:has_codec_parameters() lavf: use designated initialisers for all (de)muxers. wav: remove a use of deprecated AV_METADATA_ macro rmdec: remove useless ap parameter from rm_read_header_old() dct-test: remove write-only variable des: fix #if conditional around P_shuffle Use LOCAL_ALIGNED in ff_check_alignment() Conflicts: ffmpeg.c libavformat/avidec.c libavformat/matroskaenc.c libavformat/mp3enc.c libavformat/oggenc.c libavformat/utils.c tests/ref/lavf/mxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ivfdec.c')
-rw-r--r--libavformat/ivfdec.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/libavformat/ivfdec.c b/libavformat/ivfdec.c
index af3fe19e22..58455d02be 100644
--- a/libavformat/ivfdec.c
+++ b/libavformat/ivfdec.c
@@ -80,12 +80,11 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
}
AVInputFormat ff_ivf_demuxer = {
- "ivf",
- NULL_IF_CONFIG_SMALL("On2 IVF"),
- 0,
- probe,
- read_header,
- read_packet,
+ .name = "ivf",
+ .long_name = NULL_IF_CONFIG_SMALL("On2 IVF"),
+ .read_probe = probe,
+ .read_header = read_header,
+ .read_packet = read_packet,
.flags= AVFMT_GENERIC_INDEX,
.codec_tag = (const AVCodecTag*[]){ff_codec_bmp_tags, 0},
};