Merge commit '0ef1660a6365ce60ead8858936b6f3f8ea862826'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 10:32:24 +0000 (12:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 10:32:24 +0000 (12:32 +0200)
* commit '0ef1660a6365ce60ead8858936b6f3f8ea862826':
  sierravmd: Do sanity checking of frame sizes

Conflicts:
libavformat/sierravmd.c

See: 47c4713a23d271eedd2eb2c02daa70cb0ea4e0ac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/sierravmd.c

@@@ -91,7 -88,7 +91,8 @@@ static int vmd_read_header(AVFormatCont
      unsigned char *raw_frame_table;
      int raw_frame_table_size;
      int64_t current_offset;
-     int i, j, width, height;
+     int i, j, ret;
++    int width, height;
      unsigned int total_frames;
      int64_t current_audio_pts = 0;
      unsigned char chunk[BYTES_PER_FRAME_RECORD];