diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-01 14:07:48 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-01 14:07:48 -0300 |
| commit | a33a15751e274bf9c52a80602531fa3b9c90a9d1 (patch) | |
| tree | a124679611bdc6055c7174f1ad1f378c033aa7e0 /libavcodec/smacker.c | |
| parent | b5e2974b64e5b1192bc4f1c42f8cc294d076e33e (diff) | |
| parent | b98f082d8ddc0a0d8317114d8414ab51de60ef02 (diff) | |
| download | ffmpeg-a33a15751e274bf9c52a80602531fa3b9c90a9d1.tar.gz | |
Merge commit 'b98f082d8ddc0a0d8317114d8414ab51de60ef02'
* commit 'b98f082d8ddc0a0d8317114d8414ab51de60ef02':
smacker: Check that the data size is a multiple of a sample vector
See 4a9af07a49295e014b059c1ab624c40345af5892
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/smacker.c')
| -rw-r--r-- | libavcodec/smacker.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 2d20be9c10..3a7067e7d5 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -662,7 +662,8 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, /* get output buffer */ frame->nb_samples = unp_size / (avctx->channels * (bits + 1)); if (unp_size % (avctx->channels * (bits + 1))) { - av_log(avctx, AV_LOG_ERROR, "unp_size %d is odd\n", unp_size); + av_log(avctx, AV_LOG_ERROR, + "The buffer does not contain an integer number of samples\n"); return AVERROR(EINVAL); } if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) |