diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 15:30:19 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 15:30:19 +0400 |
commit | fa92ee821bba1d3c2a497ed22e41927b552856f8 (patch) | |
tree | 26bb0752049f1abb82e03e127f175ff2c0b78387 /libavcodec/amrnbdec.c | |
parent | 905e7eb41389e4394e9c6e459b7d1a99dc30b075 (diff) | |
parent | 63d744e2be39466e3a734c2987cd713e0bac101e (diff) |
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/amrnbdec.c')
-rw-r--r-- | libavcodec/amrnbdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c index e1773aa702..4e88b8adba 100644 --- a/libavcodec/amrnbdec.c +++ b/libavcodec/amrnbdec.c @@ -163,7 +163,7 @@ static av_cold int amrnb_decode_init(AVCodecContext *avctx) int i; if (avctx->channels > 1) { - av_log_missing_feature(avctx, "multi-channel AMR", 0); + avpriv_report_missing_feature(avctx, "multi-channel AMR"); return AVERROR_PATCHWELCOME; } |