summaryrefslogtreecommitdiffstats
path: root/libavcodec/aacdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-14 12:30:19 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-14 12:30:19 +0100
commitfa92ee821bba1d3c2a497ed22e41927b552856f8 (patch)
tree26bb0752049f1abb82e03e127f175ff2c0b78387 /libavcodec/aacdec.c
parent905e7eb41389e4394e9c6e459b7d1a99dc30b075 (diff)
parent63d744e2be39466e3a734c2987cd713e0bac101e (diff)
downloadffmpeg-streaming-fa92ee821bba1d3c2a497ed22e41927b552856f8.zip
ffmpeg-streaming-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/aacdec.c')
-rw-r--r--libavcodec/aacdec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 130996d..083fce3 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2430,7 +2430,8 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
if (!ac->warned_num_aac_frames && hdr_info.num_aac_frames != 1) {
// This is 2 for "VLB " audio in NSV files.
// See samples/nsv/vlb_audio.
- av_log_missing_feature(ac->avctx, "More than one AAC RDB per ADTS frame", 0);
+ avpriv_report_missing_feature(ac->avctx,
+ "More than one AAC RDB per ADTS frame");
ac->warned_num_aac_frames = 1;
}
push_output_configuration(ac);
OpenPOWER on IntegriCloud