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/rawdec.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/rawdec.c')
| -rw-r--r-- | libavformat/rawdec.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 34e4ae05b5..91b666051b 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -186,8 +186,8 @@ AVInputFormat ff_g722_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("raw G.722"), .read_header = ff_raw_read_header, .read_packet = ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "g722,722", + .flags = AVFMT_GENERIC_INDEX, + .extensions = "g722,722", .raw_codec_id = CODEC_ID_ADPCM_G722, }; #endif @@ -198,8 +198,8 @@ AVInputFormat ff_latm_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("raw LOAS/LATM"), .read_header = ff_raw_audio_read_header, .read_packet = ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "latm", + .flags = AVFMT_GENERIC_INDEX, + .extensions = "latm", .raw_codec_id = CODEC_ID_AAC_LATM, }; #endif @@ -214,8 +214,8 @@ AVInputFormat ff_mlp_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("raw MLP"), .read_header = ff_raw_audio_read_header, .read_packet = ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "mlp", + .flags = AVFMT_GENERIC_INDEX, + .extensions = "mlp", .raw_codec_id = CODEC_ID_MLP, }; #endif @@ -226,8 +226,8 @@ AVInputFormat ff_truehd_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("raw TrueHD"), .read_header = ff_raw_audio_read_header, .read_packet = ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "thd", + .flags = AVFMT_GENERIC_INDEX, + .extensions = "thd", .raw_codec_id = CODEC_ID_TRUEHD, }; #endif @@ -239,7 +239,7 @@ AVInputFormat ff_shorten_demuxer = { .read_header = ff_raw_audio_read_header, .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK, - .extensions = "shn", + .extensions = "shn", .raw_codec_id = CODEC_ID_SHORTEN, }; #endif |