Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / dvenc.c

diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index 049bb7b3d2fc0630010a22348990bf05582cd56c..205d3db02709a2bd2df625a39d230a528371905e 100644 (file)
--- a/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@ -333,11 +333,6 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s)
     c->frames     = 0;
     c->has_audio  = 0;
     c->has_video  = 0;
-#if FF_API_TIMESTAMP
-    if (s->timestamp)
-        c->start_time = s->timestamp;
-    else
-#endif
     if (t = av_dict_get(s->metadata, "creation_time", NULL, 0))
         c->start_time = ff_iso8601_to_unix_time(t->value);