diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-03-13 21:17:05 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-03-13 21:20:12 +0100 |
| commit | 6d97484d72e33f7dde9493a9ead1a72e2f029605 (patch) | |
| tree | 55dd3090fc63aaf22da92145fe8310cfe0cf9c78 /libavcodec/cook.c | |
| parent | 1ae07959ab39a96eee6496b418f377f9085ce4a5 (diff) | |
| download | ffmpeg-6d97484d72e33f7dde9493a9ead1a72e2f029605.tar.gz | |
avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
Diffstat (limited to 'libavcodec/cook.c')
| -rw-r--r-- | libavcodec/cook.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 135359bcd4..90d78eb3f5 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -1100,7 +1100,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) switch (q->subpacket[s].cookversion) { case MONO: if (avctx->channels != 1) { - av_log_ask_for_sample(avctx, "Container channels != 1.\n"); + avpriv_request_sample(avctx, "Container channels != 1"); return AVERROR_PATCHWELCOME; } av_log(avctx, AV_LOG_DEBUG, "MONO\n"); @@ -1114,7 +1114,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) break; case JOINT_STEREO: if (avctx->channels != 2) { - av_log_ask_for_sample(avctx, "Container channels != 2.\n"); + avpriv_request_sample(avctx, "Container channels != 2"); return AVERROR_PATCHWELCOME; } av_log(avctx, AV_LOG_DEBUG, "JOINT_STEREO\n"); @@ -1154,7 +1154,8 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) break; default: - av_log_ask_for_sample(avctx, "Unknown Cook version.\n"); + avpriv_request_sample(avctx, "Cook version %d", + q->subpacket[s].cookversion); return AVERROR_PATCHWELCOME; } @@ -1170,7 +1171,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) /* Try to catch some obviously faulty streams, othervise it might be exploitable */ if (q->subpacket[s].total_subbands > 53) { - av_log_ask_for_sample(avctx, "total_subbands > 53\n"); + avpriv_request_sample(avctx, "total_subbands > 53"); return AVERROR_PATCHWELCOME; } @@ -1182,7 +1183,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) } if (q->subpacket[s].subbands > 50) { - av_log_ask_for_sample(avctx, "subbands > 50\n"); + avpriv_request_sample(avctx, "subbands > 50"); return AVERROR_PATCHWELCOME; } q->subpacket[s].gains1.now = q->subpacket[s].gain_1; @@ -1193,7 +1194,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) q->num_subpackets++; s++; if (s > MAX_SUBPACKETS) { - av_log_ask_for_sample(avctx, "Too many subpackets > 5\n"); + avpriv_request_sample(avctx, "subpackets > %d", MAX_SUBPACKETS); return AVERROR_PATCHWELCOME; } } @@ -1235,8 +1236,7 @@ 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) { - av_log_ask_for_sample(avctx, - "unknown amount of samples_per_channel = %d\n", + avpriv_request_sample(avctx, "samples_per_channel = %d", q->samples_per_channel); return AVERROR_PATCHWELCOME; } |