lavf: remove disabled FF_API_TIMESTAMP cruft

pull/3/merge
Anton Khirnov 13 years ago
parent 3bbfd3026c
commit df0bb26aca
  1. 7
      libavformat/avformat.h
  2. 5
      libavformat/dvenc.c
  3. 5
      libavformat/gxfenc.c
  4. 5
      libavformat/movenc.c
  5. 5
      libavformat/mxfenc.c
  6. 3
      libavformat/version.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). */

@ -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);

@ -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);

@ -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)

@ -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)

@ -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

Loading…
Cancel
Save