virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

support keyframes indexes starting at 0, broken files created by omneon, fix ref.mov seeking

Browse Source 
Originally committed as revision 12242 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-02-26 18:27:21 +00:00
parent 221e21b70d
commit 26846ba515
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/mov.c
View File

@ -1389,6 +1389,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
unsigned int stts_sample = 0; unsigned int stts_sample = 0;
unsigned int keyframe, sample_size; unsigned int keyframe, sample_size;
unsigned int distance = 0; unsigned int distance = 0;
int key_off = sc->keyframes && sc->keyframes[0] == 1;
st->nb_frames = sc->sample_count; st->nb_frames = sc->sample_count;
for (i = 0; i < sc->chunk_count; i++) { 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"); av_log(mov->fc, AV_LOG_ERROR, "wrong sample count\n");
goto out; 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) { if (keyframe) {
distance = 0; distance = 0;
if (stss_index + 1 < sc->keyframe_count) if (stss_index + 1 < sc->keyframe_count)