[SCM] libav/experimental: set AVINDEX_KEYFRAME correctly for bink

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7e276c85b137ff369a671b3c9d5edd2165d415b0
Author: Peter Ross <pross at xvid.org>
Date:   Wed Feb 24 11:30:38 2010 +0000

    set AVINDEX_KEYFRAME correctly for bink
    
    Originally committed as revision 22021 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/bink.c b/libavformat/bink.c
index 62bb114..5f357a4 100644
--- a/libavformat/bink.c
+++ b/libavformat/bink.c
@@ -74,7 +74,7 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
     uint32_t fps_num, fps_den;
     AVStream *vst, *ast;
     unsigned int i;
-    uint32_t pos, prev_pos;
+    uint32_t pos, next_pos;
     uint16_t flags;
     int keyframe;
 
@@ -147,22 +147,24 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
     }
 
     /* frame index table */
-    pos = get_le32(pb) & ~1;
+    next_pos = get_le32(pb);
     for (i = 0; i < vst->duration; i++) {
-        prev_pos = pos;
+        pos = next_pos;
         if (i == vst->duration - 1) {
-            pos = bink->file_size;
+            next_pos = bink->file_size;
             keyframe = 0;
         } else {
-            pos = get_le32(pb);
+            next_pos = get_le32(pb);
             keyframe = pos & 1;
-            pos &= ~1;
         }
-        if (pos <= prev_pos) {
+        pos &= ~1;
+        next_pos &= ~1;
+
+        if (next_pos <= pos) {
             av_log(s, AV_LOG_ERROR, "invalid frame index table\n");
             return AVERROR(EIO);
         }
-        av_add_index_entry(vst, pos, i, pos - prev_pos, 0,
+        av_add_index_entry(vst, pos, i, next_pos - pos, 0,
                            keyframe ? AVINDEX_KEYFRAME : 0);
     }
 

-- 
Libav/FFmpeg packaging