diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-06 22:52:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-06 22:52:01 +0200 |
| commit | 2e0c360abd74b94991aa9a271cadc72aae1471c2 (patch) | |
| tree | cbea40b59f334f8f7447a79b6fbdf514f0dd2e0c /libavformat/ivfenc.c | |
| parent | bd128e9bff8aaec97ce7dcd414717c214536c7d9 (diff) | |
| parent | 20234a4bd7e187ae31f9a66b5c40e98666bc30e4 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cosmetics: Align muxer/demuxer declarations
mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning
avcodec: remove avcodec_guess_channel_layout()
avutil: Add av_get_default_channel_layout()
Conflicts:
doc/APIchanges
libavcodec/mpeg12.c
libavformat/cdg.c
libavformat/matroskaenc.c
libavformat/mpegts.c
libavformat/nuv.c
libavformat/wav.c
libavutil/audioconvert.c
libavutil/audioconvert.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ivfenc.c')
| -rw-r--r-- | libavformat/ivfenc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/ivfenc.c b/libavformat/ivfenc.c index 5fffaf7959..8b3f3a5421 100644 --- a/libavformat/ivfenc.c +++ b/libavformat/ivfenc.c @@ -59,11 +59,11 @@ static int ivf_write_packet(AVFormatContext *s, AVPacket *pkt) } AVOutputFormat ff_ivf_muxer = { - .name = "ivf", - .long_name = NULL_IF_CONFIG_SMALL("On2 IVF"), - .extensions = "ivf", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_VP8, + .name = "ivf", + .long_name = NULL_IF_CONFIG_SMALL("On2 IVF"), + .extensions = "ivf", + .audio_codec = CODEC_ID_NONE, + .video_codec = CODEC_ID_VP8, .write_header = ivf_write_header, .write_packet = ivf_write_packet, }; |