From df0bb26aca7ff42bf57dfc8a5f7e19baf0e1c689 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 12 Jan 2012 13:31:55 +0100
Subject: lavf: remove disabled FF_API_TIMESTAMP cruft

---
 libavformat/avformat.h | 7 -------
 libavformat/dvenc.c    | 5 -----
 libavformat/gxfenc.c   | 5 -----
 libavformat/movenc.c   | 5 -----
 libavformat/mxfenc.c   | 5 -----
 libavformat/version.h  | 3 ---
 6 files changed, 30 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 5c53972..c2ce5b8 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -809,13 +809,6 @@ typedef struct AVFormatContext {
 
     char filename[1024]; /**< input or output filename */
     /* stream info */
-#if FF_API_TIMESTAMP
-    /**
-     * @deprecated use 'creation_time' metadata tag instead
-     */
-    attribute_deprecated int64_t timestamp;
-#endif
-
     int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */
 #if FF_API_REORDER_PRIVATE
     /* private data for pts handling (do not modify directly). */
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index bffad44..56db4d2 100644
--- a/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@ -338,11 +338,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);
 
diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c
index 124064f..dcd2a8c 100644
--- a/libavformat/gxfenc.c
+++ b/libavformat/gxfenc.c
@@ -399,11 +399,6 @@ static int gxf_write_umf_material_description(AVFormatContext *s)
     AVDictionaryEntry *t;
     uint32_t timecode;
 
-#if FF_API_TIMESTAMP
-    if (s->timestamp)
-        timestamp = s->timestamp;
-    else
-#endif
     if (t = av_dict_get(s->metadata, "creation_time", NULL, 0))
         timestamp = ff_iso8601_to_unix_time(t->value);
 
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index f23a63b..eee426f 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -2807,11 +2807,6 @@ static int mov_write_header(AVFormatContext *s)
     if (!(mov->flags & FF_MOV_FLAG_EMPTY_MOOV))
         mov_write_mdat_tag(pb, mov);
 
-#if FF_API_TIMESTAMP
-    if (s->timestamp)
-        mov->time = s->timestamp;
-    else
-#endif
     if (t = av_dict_get(s->metadata, "creation_time", NULL, 0))
         mov->time = ff_iso8601_to_unix_time(t->value);
     if (mov->time)
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 65935ab..597a4f7 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -1519,11 +1519,6 @@ static int mxf_write_header(AVFormatContext *s)
         sc->order = AV_RB32(sc->track_essence_element_key+12);
     }
 
-#if FF_API_TIMESTAMP
-    if (s->timestamp)
-        timestamp = s->timestamp;
-    else
-#endif
     if (t = av_dict_get(s->metadata, "creation_time", NULL, 0))
         timestamp = ff_iso8601_to_unix_time(t->value);
     if (timestamp)
diff --git a/libavformat/version.h b/libavformat/version.h
index 4725892..59b252d 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -47,9 +47,6 @@
  * Those FF_API_* defines are not part of public API.
  * They may change, break or disappear at any time.
  */
-#ifndef FF_API_TIMESTAMP
-#define FF_API_TIMESTAMP               (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
 #ifndef FF_API_FILESIZE
 #define FF_API_FILESIZE                (LIBAVFORMAT_VERSION_MAJOR < 54)
 #endif
-- 
cgit v1.1