Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-07 00:52:01 +0400
committerMichael Niedermayer <michaelni@gmx.at>2012-04-07 00:52:01 +0400
commit2e0c360abd74b94991aa9a271cadc72aae1471c2 (patch)
treecbea40b59f334f8f7447a79b6fbdf514f0dd2e0c /libavformat/rawvideodec.c
parentbd128e9bff8aaec97ce7dcd414717c214536c7d9 (diff)
parent20234a4bd7e187ae31f9a66b5c40e98666bc30e4 (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/rawvideodec.c')
-rw-r--r--libavformat/rawvideodec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c
index 7750eb2880..da80ae9c19 100644
--- a/libavformat/rawvideodec.c
+++ b/libavformat/rawvideodec.c
@@ -66,8 +66,8 @@ AVInputFormat ff_rawvideo_demuxer = {
.priv_data_size = sizeof(FFRawVideoDemuxerContext),
.read_header = ff_raw_read_header,
.read_packet = rawvideo_read_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "yuv,cif,qcif,rgb",
+ .flags = AVFMT_GENERIC_INDEX,
+ .extensions = "yuv,cif,qcif,rgb",
.raw_codec_id = CODEC_ID_RAWVIDEO,
- .priv_class = &rawvideo_demuxer_class,
+ .priv_class = &rawvideo_demuxer_class,
};