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 /libavcodec/ac3enc.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 'libavcodec/ac3enc.c')
| -rw-r--r-- | libavcodec/ac3enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 3d01249285..e04e70d8bc 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -2071,7 +2071,7 @@ static av_cold int set_channel_info(AC3EncodeContext *s, int channels, return AVERROR(EINVAL); ch_layout = *channel_layout; if (!ch_layout) - ch_layout = avcodec_guess_channel_layout(channels, CODEC_ID_AC3, NULL); + ch_layout = av_get_default_channel_layout(channels); s->lfe_on = !!(ch_layout & AV_CH_LOW_FREQUENCY); s->channels = channels; |