Merge commit '563e6d860391bac0511984e5c0842320b5c94d2d'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:18:05 +0000 (18:18 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:18:05 +0000 (18:18 +0100)
* commit '563e6d860391bac0511984e5c0842320b5c94d2d':
  segafilm: drop the "song and dance" for cinepak

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavformat/segafilm.c

@@@ -280,10 -280,9 +280,9 @@@ static int film_read_packet(AVFormatCon
      /* position the stream (will probably be there anyway) */
      avio_seek(pb, sample->sample_offset, SEEK_SET);
  
-     ret= av_get_packet(pb, pkt, sample->sample_size);
+     ret = av_get_packet(pb, pkt, sample->sample_size);
 -    if (ret < 0)
 -        return ret;
 +    if (ret != sample->sample_size)
 +        ret = AVERROR(EIO);
  
      pkt->stream_index = sample->stream;
      pkt->pts = sample->pts;