lavf: remove disabled FF_API_LOOP_INPUT cruft

pull/3/merge
Anton Khirnov 13 years ago
parent b32e30faa1
commit 6dc345555f
  1. 7
      libavformat/avformat.h
  2. 5
      libavformat/img2.c
  3. 3
      libavformat/version.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.
*/

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

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

Loading…
Cancel
Save