Browse Source

ffv1: fix calculating slice dimensions for version 2

It got broken in 0f13cd3187.

CC:libav-stable@libav.org
tags/n2.0
Anton Khirnov 12 years ago
parent
commit
d243896987
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavcodec/ffv1dec.c

+ 2
- 2
libavcodec/ffv1dec.c View File

@@ -734,8 +734,8 @@ static int read_header(FFV1Context *f)


fs->slice_x /= f->num_h_slices; fs->slice_x /= f->num_h_slices;
fs->slice_y /= f->num_v_slices; fs->slice_y /= f->num_v_slices;
fs->slice_width /= f->num_h_slices - fs->slice_x;
fs->slice_height /= f->num_v_slices - fs->slice_y;
fs->slice_width = fs->slice_width / f->num_h_slices - fs->slice_x;
fs->slice_height = fs->slice_height / f->num_v_slices - fs->slice_y;
if ((unsigned)fs->slice_width > f->width || if ((unsigned)fs->slice_width > f->width ||
(unsigned)fs->slice_height > f->height) (unsigned)fs->slice_height > f->height)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;


Loading…
Cancel
Save