Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / segafilm.c

diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index c0a5e0f81e9a371576ca546c5d0ed19bf6f083af..9c171f0b502acc075f5105059ab19e23ae7ae2fb 100644 (file)
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -290,7 +290,7 @@ static int film_read_packet(AVFormatContext *s,
 
         left = 0;
         right = sample->sample_size / 2;
-        for (i = 0; i < sample->sample_size; ) {
+        for (i = 0; i + 1 + 2*(film->audio_bits != 8) < sample->sample_size; ) {
             if (film->audio_bits == 8) {
                 pkt->data[i++] = film->stereo_buffer[left++];
                 pkt->data[i++] = film->stereo_buffer[right++];