From 32e5194969e026d790e72e0b3f8f254979ea0f36 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Sat, 23 Feb 2013 08:20:12 +0100
Subject: [PATCH 1/2] lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft

---
 libavformat/avformat.h | 10 ----------
 libavformat/mux.c      |  9 ---------
 libavformat/version.h  |  3 ---
 3 files changed, 22 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index de4f62ca04..da7fb791ff 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1449,16 +1449,6 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt);
  */
 int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
 
-#if FF_API_INTERLEAVE_PACKET
-/**
- * @deprecated this function was never meant to be called by the user
- * programs.
- */
-attribute_deprecated
-int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
-                                 AVPacket *pkt, int flush);
-#endif
-
 /**
  * Write the stream trailer to an output media file and free the
  * file private data.
diff --git a/libavformat/mux.c b/libavformat/mux.c
index cb3c297a6b..76b0fb4dc6 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -495,15 +495,6 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
     }
 }
 
-#if FF_API_INTERLEAVE_PACKET
-int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
-                                 AVPacket *pkt, int flush)
-{
-    return ff_interleave_packet_per_dts(s, out, pkt, flush);
-}
-
-#endif
-
 /**
  * Interleave an AVPacket correctly so it can be muxed.
  * @param out the interleaved packet will be output here
diff --git a/libavformat/version.h b/libavformat/version.h
index 0b19238163..4add31e776 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -49,9 +49,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_INTERLEAVE_PACKET
-#define FF_API_INTERLEAVE_PACKET       (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
 #ifndef FF_API_AV_GETTIME
 #define FF_API_AV_GETTIME              (LIBAVFORMAT_VERSION_MAJOR < 55)
 #endif

From 7b486ab13bfcfa88a7cd92586de50e49966ec292 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Sat, 23 Feb 2013 08:20:12 +0100
Subject: [PATCH 2/2] lavf: remove disabled FF_API_AV_GETTIME cruft

---
 libavformat/avformat.h | 4 ----
 libavformat/utils.c    | 7 -------
 libavformat/version.h  | 3 ---
 3 files changed, 14 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index da7fb791ff..08d2f3a876 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -207,10 +207,6 @@
 #include "avio.h"
 #include "libavformat/version.h"
 
-#if FF_API_AV_GETTIME
-#include "libavutil/time.h"
-#endif
-
 struct AVFormatContext;
 
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index a5a696d6a4..b127e27ce3 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3015,13 +3015,6 @@ void av_dump_format(AVFormatContext *ic,
     av_free(printed);
 }
 
-#if FF_API_AV_GETTIME && CONFIG_SHARED && HAVE_SYMVER
-FF_SYMVER(int64_t, av_gettime, (void), "LIBAVFORMAT_54")
-{
-    return av_gettime();
-}
-#endif
-
 uint64_t ff_ntp_time(void)
 {
   return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US;
diff --git a/libavformat/version.h b/libavformat/version.h
index 4add31e776..fc34896eb9 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -49,9 +49,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_AV_GETTIME
-#define FF_API_AV_GETTIME              (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
 #ifndef FF_API_R_FRAME_RATE
 #define FF_API_R_FRAME_RATE            (LIBAVFORMAT_VERSION_MAJOR < 55)
 #endif