diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 13:07:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 13:07:25 +0100 |
| commit | cacbf64a76acb69b2efd773e8d7ab01bc957560d (patch) | |
| tree | 80e9d70ed0a266a3540daa5707ff5b71ee2b475f /libavcodec/aacdec.c | |
| parent | 13795dbb642cecf46e75fb6a78c830bf862c2310 (diff) | |
| parent | 12e25ed284592b32c954d471e9b7b1e5a0dbf18d (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()
Conflicts:
libavcodec/aacsbr.c
libavcodec/amrnbdec.c
libavcodec/takdec.c
libavcodec/tta.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 0119d39daf..37c7de5e90 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -709,7 +709,7 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx, int tags = 0; if (get_bits1(gb)) { // frameLengthFlag - av_log_missing_feature(avctx, "960/120 MDCT window", 1); + avpriv_request_sample(avctx, "960/120 MDCT window"); return AVERROR_PATCHWELCOME; } @@ -1713,7 +1713,7 @@ static int decode_ics(AACContext *ac, SingleChannelElement *sce, if ((tns->present = get_bits1(gb)) && decode_tns(ac, tns, gb, ics)) return -1; if (get_bits1(gb)) { - av_log_missing_feature(ac->avctx, "SSR", 1); + avpriv_request_sample(ac->avctx, "SSR"); return AVERROR_PATCHWELCOME; } } @@ -2750,8 +2750,8 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx, asclen = get_bits_left(gb); if (config_start_bit % 8) { - av_log_missing_feature(latmctx->aac_ctx.avctx, - "Non-byte-aligned audio-specific config", 1); + avpriv_request_sample(latmctx->aac_ctx.avctx, + "Non-byte-aligned audio-specific config"); return AVERROR_PATCHWELCOME; } if (asclen <= 0) @@ -2810,8 +2810,7 @@ static int read_stream_mux_config(struct LATMContext *latmctx, skip_bits(gb, 6); // numSubFrames // numPrograms if (get_bits(gb, 4)) { // numPrograms - av_log_missing_feature(latmctx->aac_ctx.avctx, - "Multiple programs", 1); + avpriv_request_sample(latmctx->aac_ctx.avctx, "Multiple programs"); return AVERROR_PATCHWELCOME; } @@ -2819,8 +2818,7 @@ static int read_stream_mux_config(struct LATMContext *latmctx, // for each layer (which there is only one in DVB) if (get_bits(gb, 3)) { // numLayer - av_log_missing_feature(latmctx->aac_ctx.avctx, - "Multiple layers", 1); + avpriv_request_sample(latmctx->aac_ctx.avctx, "Multiple layers"); return AVERROR_PATCHWELCOME; } |