Commit e0f29182 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'f457edb6'

* commit 'f457edb6':
  aacdec: Use avpriv_report_missing_feature() instead of custom logging.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 078abccd f457edb6
...@@ -793,9 +793,9 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx, ...@@ -793,9 +793,9 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx,
case AOT_ER_AAC_LD: case AOT_ER_AAC_LD:
res_flags = get_bits(gb, 3); res_flags = get_bits(gb, 3);
if (res_flags) { if (res_flags) {
av_log(avctx, AV_LOG_ERROR, avpriv_report_missing_feature(avctx, AV_LOG_ERROR,
"AAC data resilience not supported (flags %x)\n", "AAC data resilience (flags %x)",
res_flags); res_flags);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
break; break;
...@@ -809,9 +809,8 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx, ...@@ -809,9 +809,8 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx,
case AOT_ER_AAC_LD: case AOT_ER_AAC_LD:
ep_config = get_bits(gb, 2); ep_config = get_bits(gb, 2);
if (ep_config) { if (ep_config) {
av_log(avctx, AV_LOG_ERROR, avpriv_report_missing_feature(avctx, AV_LOG_ERROR,
"epConfig %d is not supported.\n", "epConfig %d", ep_config);
ep_config);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
} }
...@@ -877,10 +876,10 @@ static int decode_audio_specific_config(AACContext *ac, ...@@ -877,10 +876,10 @@ static int decode_audio_specific_config(AACContext *ac,
return ret; return ret;
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, avpriv_report_missing_feature(avctx, AV_LOG_ERROR,
"Audio object type %s%d is not supported.\n", "Audio object type %s%d",
m4ac->sbr == 1 ? "SBR+" : "", m4ac->sbr == 1 ? "SBR+" : "",
m4ac->object_type); m4ac->object_type);
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment