diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:00:27 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:00:27 +0200 |
commit | 35ce42e07029b3af62f652a53719fee99bb7a5aa (patch) | |
tree | 455a7ab81008cbbfa9cd3c14468c2b28f2bd6206 /libavcodec/aacdec.c | |
parent | d0ac26a264e5b9d5d7d19efddd7205faf1e124d4 (diff) | |
parent | 8b8899ac3233b4f7af83ded0dc032fad8902d714 (diff) |
Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'
* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714':
fate: Declare avcodec/avformat deps in the respective Makefile snippets
fate: Add dependencies for WMA and WavPack tests
Improve wording and spelling of av_log_missing_feature messages.
lavu: remove disabled FF_API_AV_FIFO_PEEK cruft
Conflicts:
libavcodec/aacsbr.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdec.c')
-rw-r--r-- | libavcodec/aacdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 295243a573..f180d78f5b 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2789,7 +2789,7 @@ static int read_stream_mux_config(struct LATMContext *latmctx, // numPrograms if (get_bits(gb, 4)) { // numPrograms av_log_missing_feature(latmctx->aac_ctx.avctx, - "multiple programs", 1); + "Multiple programs", 1); return AVERROR_PATCHWELCOME; } @@ -2798,7 +2798,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); + "Multiple layers", 1); return AVERROR_PATCHWELCOME; } |