OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9b3c455
)
Correct bundle lengths calculation for small Bink files.
author
Kostya Shishkov
<kostya.shishkov@gmail.com>
Mon, 22 Feb 2010 12:20:49 +0000
(12:20 +0000)
committer
Kostya Shishkov
<kostya.shishkov@gmail.com>
Mon, 22 Feb 2010 12:20:49 +0000
(12:20 +0000)
This fixes issue 1764.
Originally committed as revision 21959 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/bink.c
patch
|
blob
|
history
diff --git
a/libavcodec/bink.c
b/libavcodec/bink.c
index
3e8f15f
..
661f75f
100644
(file)
--- a/
libavcodec/bink.c
+++ b/
libavcodec/bink.c
@@
-698,8
+698,9
@@
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
const int stride = c->pic.linesize[plane];
int bw = plane ? (avctx->width + 15) >> 4 : (avctx->width + 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++)
read_bundle(&gb, c, i);