[SCM] libav/experimental: support keyframes indexes starting at 0, broken files created by omneon, fix ref.mov seeking

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 26846ba5151b0fe90e21c1a6beb9a3bcb569d1ac
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Tue Feb 26 18:27:21 2008 +0000

    support keyframes indexes starting at 0, broken files created by omneon, fix ref.mov seeking
    
    Originally committed as revision 12242 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2e57915..71ddc6a 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1389,6 +1389,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
         unsigned int stts_sample = 0;
         unsigned int keyframe, sample_size;
         unsigned int distance = 0;
+        int key_off = sc->keyframes && sc->keyframes[0] == 1;
 
         st->nb_frames = sc->sample_count;
         for (i = 0; i < sc->chunk_count; i++) {
@@ -1401,7 +1402,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
                     av_log(mov->fc, AV_LOG_ERROR, "wrong sample count\n");
                     goto out;
                 }
-                keyframe = !sc->keyframe_count || current_sample + 1 == sc->keyframes[stss_index];
+                keyframe = !sc->keyframe_count || current_sample+key_off == sc->keyframes[stss_index];
                 if (keyframe) {
                     distance = 0;
                     if (stss_index + 1 < sc->keyframe_count)

-- 
Libav/FFmpeg packaging