summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/smc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libffmpeg/libavcodec/smc.c')
-rw-r--r--src/libffmpeg/libavcodec/smc.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libffmpeg/libavcodec/smc.c b/src/libffmpeg/libavcodec/smc.c
index e937b03c8..dbb5adef1 100644
--- a/src/libffmpeg/libavcodec/smc.c
+++ b/src/libffmpeg/libavcodec/smc.c
@@ -125,7 +125,7 @@ static void smc_decode_stream(SmcContext *s)
chunk_size, s->size);
chunk_size = s->size;
- total_blocks = (s->avctx->width * s->avctx->height) / (4 * 4);
+ total_blocks = ((s->avctx->width + 3) / 4) * ((s->avctx->height + 3) / 4);
/* traverse through the blocks */
while (total_blocks) {
@@ -448,10 +448,6 @@ static int smc_decode_frame(AVCodecContext *avctx,
{
SmcContext *s = (SmcContext *)avctx->priv_data;
- /* no supplementary picture */
- if (buf_size == 0)
- return 0;
-
s->buf = buf;
s->size = buf_size;