[FFmpeg-cvslog] lavf: remove disabled FF_API_LOOP_INPUT cruft

Anton Khirnov git at videolan.org
Sat Jan 28 08:05:11 CET 2012


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Jan 12 13:31:55 2012 +0100| [6dc345555f3bd91065c217ed8a06f8f07d399ced] | committer: Anton Khirnov

lavf: remove disabled FF_API_LOOP_INPUT cruft

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6dc345555f3bd91065c217ed8a06f8f07d399ced
---

 libavformat/avformat.h |    7 -------
 libavformat/img2.c     |    5 -----
 libavformat/version.h  |    3 ---
 3 files changed, 0 insertions(+), 15 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 8f02941..8a99535 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -897,13 +897,6 @@ typedef struct AVFormatContext {
 #define AVFMT_FLAG_CUSTOM_IO    0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
 #define AVFMT_FLAG_DISCARD_CORRUPT  0x0100 ///< Discard frames marked corrupted
 
-#if FF_API_LOOP_INPUT
-    /**
-     * @deprecated, use the 'loop' img2 demuxer private option.
-     */
-    attribute_deprecated int loop_input;
-#endif
-
     /**
      * decoding: size of data to probe; encoding: unused.
      */
diff --git a/libavformat/img2.c b/libavformat/img2.c
index 4ff4767..f7a9fa5 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -228,11 +228,6 @@ static int read_header(AVFormatContext *s1)
         return ret;
     }
 
-#if FF_API_LOOP_INPUT
-    if (s1->loop_input)
-        s->loop = s1->loop_input;
-#endif
-
     av_strlcpy(s->path, s1->filename, sizeof(s->path));
     s->img_number = 0;
     s->img_count = 0;
diff --git a/libavformat/version.h b/libavformat/version.h
index d6bf49b..197dc37 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_LOOP_INPUT
-#define FF_API_LOOP_INPUT              (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
 #ifndef FF_API_LOOP_OUTPUT
 #define FF_API_LOOP_OUTPUT             (LIBAVFORMAT_VERSION_MAJOR < 54)
 #endif



More information about the ffmpeg-cvslog mailing list