summaryrefslogtreecommitdiff
path: root/libavformat/mxfenc.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-03-14 22:43:28 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-03-14 22:43:28 +0000
commit2261a952f9fde6a44225f683dfa1e6dd3892584b (patch)
tree894de84923e2de11ad8e420bc746fe67d2a785cd /libavformat/mxfenc.c
parent881dad9e764d4d419345400953eb232187d0a389 (diff)
do not parse timestamp if bitexact is set, should fix regression tests
Originally committed as revision 17967 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mxfenc.c')
-rw-r--r--libavformat/mxfenc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 0f3a1b373f..2732d8bbaa 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -1490,8 +1490,10 @@ static int mxf_write_header(AVFormatContext *s)
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->timestamp = mxf_parse_timestamp(s->timestamp);
+ }
for (i = 0; i < s->nb_streams; i++) {
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);
}
- mxf->timestamp = mxf_parse_timestamp(s->timestamp);
mxf->duration = -1;
mxf->timecode_track = av_mallocz(sizeof(*mxf->timecode_track));