diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:30:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:30:19 +0100 |
| commit | fa92ee821bba1d3c2a497ed22e41927b552856f8 (patch) | |
| tree | 26bb0752049f1abb82e03e127f175ff2c0b78387 /libavcodec/libopencore-amr.c | |
| parent | 905e7eb41389e4394e9c6e459b7d1a99dc30b075 (diff) | |
| parent | 63d744e2be39466e3a734c2987cd713e0bac101e (diff) | |
| download | ffmpeg-fa92ee821bba1d3c2a497ed22e41927b552856f8.tar.gz | |
Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'
* commit '63d744e2be39466e3a734c2987cd713e0bac101e':
av_log_missing_feature() ---> avpriv_report_missing_feature()
Conflicts:
libavcodec/aacdec.c
libavcodec/tta.c
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libopencore-amr.c')
| -rw-r--r-- | libavcodec/libopencore-amr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index 1a416ce6d6..c991106abb 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -35,7 +35,7 @@ static int amr_decode_fix_avctx(AVCodecContext *avctx) avctx->sample_rate = 8000 * is_amr_wb; if (avctx->channels > 1) { - av_log_missing_feature(avctx, "multi-channel AMR", 0); + avpriv_report_missing_feature(avctx, "multi-channel AMR"); return AVERROR_PATCHWELCOME; } |