Browse Source

do not parse timestamp if bitexact is set, should fix regression tests

Originally committed as revision 17967 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Baptiste Coudurier 16 years ago
parent
commit
2261a952f9
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      libavformat/mxfenc.c

+ 3
- 2
libavformat/mxfenc.c View File

@@ -1490,8 +1490,10 @@ static int mxf_write_header(AVFormatContext *s)
mxf->essence_container_count = 1; mxf->essence_container_count = 1;
} }


if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT))
if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
mxf_gen_umid(s); mxf_gen_umid(s);
mxf->timestamp = mxf_parse_timestamp(s->timestamp);
}


for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
MXFStreamContext *sc = s->streams[i]->priv_data; MXFStreamContext *sc = s->streams[i]->priv_data;
@@ -1500,7 +1502,6 @@ static int mxf_write_header(AVFormatContext *s)
sc->order = AV_RB32(sc->track_essence_element_key+12); sc->order = AV_RB32(sc->track_essence_element_key+12);
} }


mxf->timestamp = mxf_parse_timestamp(s->timestamp);
mxf->duration = -1; mxf->duration = -1;


mxf->timecode_track = av_mallocz(sizeof(*mxf->timecode_track)); mxf->timecode_track = av_mallocz(sizeof(*mxf->timecode_track));


Loading…
Cancel
Save