Commit 1b50877c authored by kostya's avatar kostya

Correct bundle lengths calculation for small Bink files.

This fixes issue 1764.



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@21959 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 922a37fb
...@@ -698,8 +698,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac ...@@ -698,8 +698,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
const int stride = c->pic.linesize[plane]; const int stride = c->pic.linesize[plane];
int bw = plane ? (avctx->width + 15) >> 4 : (avctx->width + 7) >> 3; int bw = plane ? (avctx->width + 15) >> 4 : (avctx->width + 7) >> 3;
int bh = plane ? (avctx->height + 15) >> 4 : (avctx->height + 7) >> 3; int bh = plane ? (avctx->height + 15) >> 4 : (avctx->height + 7) >> 3;
int width = avctx->width >> !!plane;
init_lengths(c, avctx->width >> !!plane, bw); init_lengths(c, FFMAX(width, 8), bw);
for (i = 0; i < BINK_NB_SRC; i++) for (i = 0; i < BINK_NB_SRC; i++)
read_bundle(&gb, c, i); read_bundle(&gb, c, i);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment