virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

Merge commit 'f457edb69794c7e13b3630456d72f7942fff19f7'

Browse Source 
* commit 'f457edb69794c7e13b3630456d72f7942fff19f7':
  aacdec: Use avpriv_report_missing_feature() instead of custom logging.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-23 09:53:52 +02:00
commit e0f2918223
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/aacdec.c
View File

@ -793,9 +793,9 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx,
case AOT_ER_AAC_LD:
res_flags = get_bits(gb, 3);
if (res_flags) {
av_log(avctx, AV_LOG_ERROR,
"AAC data resilience not supported (flags %x)\n",
res_flags);
avpriv_report_missing_feature(avctx, AV_LOG_ERROR,
"AAC data resilience (flags %x)",
res_flags);
return AVERROR_PATCHWELCOME;
}
break;
@ -809,9 +809,8 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx,
case AOT_ER_AAC_LD:
ep_config = get_bits(gb, 2);
if (ep_config) {
av_log(avctx, AV_LOG_ERROR,
"epConfig %d is not supported.\n",
ep_config);
avpriv_report_missing_feature(avctx, AV_LOG_ERROR,
"epConfig %d", ep_config);
return AVERROR_PATCHWELCOME;
}
}
@ -877,10 +876,10 @@ static int decode_audio_specific_config(AACContext *ac,
return ret;
break;
default:
av_log(avctx, AV_LOG_ERROR,
"Audio object type %s%d is not supported.\n",
m4ac->sbr == 1 ? "SBR+" : "",
m4ac->object_type);
avpriv_report_missing_feature(avctx, AV_LOG_ERROR,
"Audio object type %s%d",
m4ac->sbr == 1 ? "SBR+" : "",
m4ac->object_type);
return AVERROR(ENOSYS);
}