aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-01-12 13:31:55 +0100
committerAnton Khirnov <anton@khirnov.net>2012-01-27 10:52:42 +0100
commit3bbfd3026c6d692696066b041f4ba4ed9c938e5d (patch)
tree3a0d062b790e6f14b36c91b99b0ddbbd26203bfc
parent6dc345555f3bd91065c217ed8a06f8f07d399ced (diff)
downloadffmpeg-3bbfd3026c6d692696066b041f4ba4ed9c938e5d.tar.gz
lavf: remove disabled FF_API_LOOP_OUTPUT cruft
-rw-r--r--libavformat/avformat.h11
-rw-r--r--libavformat/gif.c5
-rw-r--r--libavformat/version.h3
3 files changed, 0 insertions, 19 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 8a99535024..5c53972851 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -876,17 +876,6 @@ typedef struct AVFormatContext {
#endif
int max_delay;
-#if FF_API_LOOP_OUTPUT
-#define AVFMT_NOOUTPUTLOOP -1
-#define AVFMT_INFINITEOUTPUTLOOP 0
- /**
- * number of times to loop output in formats that support it
- *
- * @deprecated use the 'loop' private option in the gif muxer.
- */
- attribute_deprecated int loop_output;
-#endif
-
int flags;
#define AVFMT_FLAG_GENPTS 0x0001 ///< Generate missing pts even if it requires parsing future frames.
#define AVFMT_FLAG_IGNIDX 0x0002 ///< Ignore index.
diff --git a/libavformat/gif.c b/libavformat/gif.c
index 3ef7ebe9be..eb1e9f04fb 100644
--- a/libavformat/gif.c
+++ b/libavformat/gif.c
@@ -288,11 +288,6 @@ static int gif_write_header(AVFormatContext *s)
return AVERROR(EIO);
}
-#if FF_API_LOOP_OUTPUT
- if (s->loop_output)
- gif->loop = s->loop_output;
-#endif
-
gif_image_write_header(pb, width, height, gif->loop, NULL);
avio_flush(s->pb);
diff --git a/libavformat/version.h b/libavformat/version.h
index 197dc37c32..4725892239 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_OUTPUT
-#define FF_API_LOOP_OUTPUT (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
#ifndef FF_API_TIMESTAMP
#define FF_API_TIMESTAMP (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif