har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support negative ctts in some way, unset wrong dts

Browse Source 
Originally committed as revision 15468 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-09-30 02:44:57 +00:00
parent ae4ffe9f64
commit 0c5f76f708
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mov.c
View File

@ -133,6 +133,7 @@ typedef struct MOVStreamContext {
unsigned drefs_count;
MOV_dref_t *drefs;
int dref_id;
int wrong_dts; ///< dts are wrong due to negative ctts
} MOVStreamContext;
typedef struct MOVContext {
@ -1166,15 +1167,13 @@ static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
int duration =get_be32(pb);
if (duration < 0) {
av_log(c->fc, AV_LOG_WARNING, "negative ctts, ignoring\n");
sc->ctts_count = 0;
url_fskip(pb, 8 * (entries - i - 1));
break;
sc->wrong_dts = 1;
st->codec->has_b_frames = 1;
}
sc->ctts_data[i].count = count;
sc->ctts_data[i].duration= duration;
sc->time_rate= ff_gcd(sc->time_rate, duration);
sc->time_rate= ff_gcd(sc->time_rate, FFABS(duration));
}
return 0;
}
@ -1882,6 +1881,8 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
sc->sample_to_ctime_index++;
sc->sample_to_ctime_sample = 0;
}
if (sc->wrong_dts)
pkt->dts = AV_NOPTS_VALUE;
} else {
AVStream *st = s->streams[sc->ffindex];
int64_t next_dts = (sc->current_sample < sc->sample_count) ?