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/rawenc.c | |
| parent | bd128e9bff8aaec97ce7dcd414717c214536c7d9 (diff) | |
| parent | 20234a4bd7e187ae31f9a66b5c40e98666bc30e4 (diff) | |
| download | ffmpeg-2e0c360abd74b94991aa9a271cadc72aae1471c2.tar.gz | |
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/rawenc.c')
| -rw-r--r-- | libavformat/rawenc.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 4c1ede4928..cb68014be5 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -41,7 +41,7 @@ AVOutputFormat ff_ac3_muxer = { .audio_codec = CODEC_ID_AC3, .video_codec = CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -65,7 +65,7 @@ AVOutputFormat ff_dirac_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_DIRAC, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -77,7 +77,7 @@ AVOutputFormat ff_dnxhd_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_DNXHD, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -90,7 +90,7 @@ AVOutputFormat ff_dts_muxer = { .audio_codec = CODEC_ID_DTS, .video_codec = CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -103,7 +103,7 @@ AVOutputFormat ff_eac3_muxer = { .audio_codec = CODEC_ID_EAC3, .video_codec = CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -116,7 +116,7 @@ AVOutputFormat ff_g722_muxer = { .audio_codec = CODEC_ID_ADPCM_G722, .video_codec = CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -142,7 +142,7 @@ AVOutputFormat ff_h261_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_H261, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -155,7 +155,7 @@ AVOutputFormat ff_h263_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_H263, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -167,7 +167,7 @@ AVOutputFormat ff_h264_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_H264, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -179,7 +179,7 @@ AVOutputFormat ff_cavsvideo_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_CAVS, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -191,7 +191,7 @@ AVOutputFormat ff_m4v_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_MPEG4, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -204,7 +204,7 @@ AVOutputFormat ff_mjpeg_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_MJPEG, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -216,7 +216,7 @@ AVOutputFormat ff_mlp_muxer = { .audio_codec = CODEC_ID_MLP, .video_codec = CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -240,7 +240,7 @@ AVOutputFormat ff_truehd_muxer = { .audio_codec = CODEC_ID_TRUEHD, .video_codec = CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -253,7 +253,7 @@ AVOutputFormat ff_mpeg1video_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_MPEG1VIDEO, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -265,7 +265,7 @@ AVOutputFormat ff_mpeg2video_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_MPEG2VIDEO, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -277,6 +277,6 @@ AVOutputFormat ff_rawvideo_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_RAWVIDEO, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif |