diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:42:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:42:49 +0200 |
| commit | 18884f159b617208dd69fb35fa127f4fdedf5ba1 (patch) | |
| tree | 2eae5d696ef3b8f8f03cb9c58ee88632ff9cc856 /libavcodec/aacdec.c | |
| parent | c55bebe2cc7bd444f83a678babc1b287aa7a3da1 (diff) | |
| parent | 0a7005bebd23ade7bb852bce0401af1a8fdbb723 (diff) | |
Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'
* commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723':
rtpdec_xiph: fix function return type
smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
mpegvideo: remove write-only variable
Use proper return values in case of missing features
fate: add avstring test
rangecoder-test: Set error message log level to error, instead of debug
Conflicts:
libavcodec/aacdec.c
libavcodec/amrnbdec.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 8ab678768e..295243a573 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -666,7 +666,7 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx, if (get_bits1(gb)) { // frameLengthFlag av_log_missing_feature(avctx, "960/120 MDCT window", 1); - return -1; + return AVERROR_PATCHWELCOME; } if (get_bits1(gb)) // dependsOnCoreCoder @@ -1670,7 +1670,7 @@ static int decode_ics(AACContext *ac, SingleChannelElement *sce, return -1; if (get_bits1(gb)) { av_log_missing_feature(ac->avctx, "SSR", 1); - return -1; + return AVERROR_PATCHWELCOME; } } @@ -2730,7 +2730,7 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx, if (config_start_bit % 8) { av_log_missing_feature(latmctx->aac_ctx.avctx, "Non-byte-aligned audio-specific config", 1); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } if (asclen <= 0) return AVERROR_INVALIDDATA; |