diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-23 01:09:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-23 01:09:43 +0200 |
| commit | e16665bf72d226b2c87c76a677414b8ef7720d7e (patch) | |
| tree | b68414614d4ce2eecee89185f80a30a039899bb2 /libavcodec/cook.c | |
| parent | 03ac7991286c583c73c8c44c71aeba1265c61cba (diff) | |
| parent | d9dee728b8c50fb6dbff3701e1abcb2eac5895b3 (diff) | |
| download | ffmpeg-e16665bf72d226b2c87c76a677414b8ef7720d7e.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Use av_log_ask_for_sample() to request samples from users.
Make av_log_ask_for_sample() accept a variable number of arguments.
vqavideo: We no longer need to ask for version 1 samples.
aacdec: indentation cosmetics
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cook.c')
| -rw-r--r-- | libavcodec/cook.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 27a45f318b..41a869e7ba 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -1268,7 +1268,9 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) /* Try to catch some obviously faulty streams, othervise it might be exploitable */ if ((q->samples_per_channel == 256) || (q->samples_per_channel == 512) || (q->samples_per_channel == 1024)) { } else { - av_log(avctx,AV_LOG_ERROR,"unknown amount of samples_per_channel = %d, report sample!\n",q->samples_per_channel); + av_log_ask_for_sample(avctx, + "unknown amount of samples_per_channel = %d\n", + q->samples_per_channel); return -1; } |