virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

img2: add loop private option.

Browse Source 
Deprecate AVFormatContext.loop_input.
This commit is contained in:
Anton Khirnov 2011-06-18 09:28:49 +02:00
parent a726d7fd4e
commit 6002fdef5e
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/avformat.h
View File

@ -742,7 +742,12 @@ typedef struct AVFormatContext {
#endif #endif
#define AVFMT_FLAG_CUSTOM_IO 0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it. #define AVFMT_FLAG_CUSTOM_IO 0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
int loop_input; #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. * decoding: size of data to probe; encoding: unused.

9
libavformat/img2.c
View File

@ -42,6 +42,7 @@ typedef struct {
char *pixel_format; /**< Set by a private option. */ char *pixel_format; /**< Set by a private option. */
char *video_size; /**< Set by a private option. */ char *video_size; /**< Set by a private option. */
char *framerate; /**< Set by a private option. */ char *framerate; /**< Set by a private option. */
int loop;
} VideoData; } VideoData;
typedef struct { typedef struct {
@ -243,6 +244,11 @@ static int read_header(AVFormatContext *s1, AVFormatParameters *ap)
framerate = (AVRational){ap->time_base.den, ap->time_base.num}; framerate = (AVRational){ap->time_base.den, ap->time_base.num};
#endif #endif
#if FF_API_LOOP_INPUT
if (s1->loop_input)
s->loop = s1->loop_input;
#endif
av_strlcpy(s->path, s1->filename, sizeof(s->path)); av_strlcpy(s->path, s1->filename, sizeof(s->path));
s->img_number = 0; s->img_number = 0;
s->img_count = 0; s->img_count = 0;
@ -300,7 +306,7 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt)
if (!s->is_pipe) { if (!s->is_pipe) {
/* loop over input */ /* loop over input */
if (s1->loop_input && s->img_number > s->img_last) { if (s->loop && s->img_number > s->img_last) {
s->img_number = s->img_first; s->img_number = s->img_first;
} }
if (s->img_number > s->img_last) if (s->img_number > s->img_last)
@ -458,6 +464,7 @@ static const AVOption options[] = {
{ "pixel_format", "", OFFSET(pixel_format), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { "pixel_format", "", OFFSET(pixel_format), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
{ "video_size", "", OFFSET(video_size), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { "video_size", "", OFFSET(video_size), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
{ "framerate", "", OFFSET(framerate), FF_OPT_TYPE_STRING, {.str = "25"}, 0, 0, DEC }, { "framerate", "", OFFSET(framerate), FF_OPT_TYPE_STRING, {.str = "25"}, 0, 0, DEC },
{ "loop", "", OFFSET(loop), FF_OPT_TYPE_INT, {.dbl = 0}, 0, 1, DEC },
{ NULL }, { NULL },
}; };

3
libavformat/version.h
View File

@ -77,5 +77,8 @@
#ifndef FF_API_AVSTREAM_QUALITY #ifndef FF_API_AVSTREAM_QUALITY
#define FF_API_AVSTREAM_QUALITY (LIBAVFORMAT_VERSION_MAJOR < 54) #define FF_API_AVSTREAM_QUALITY (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif #endif
#ifndef FF_API_LOOP_INPUT
#define FF_API_LOOP_INPUT (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#endif /* AVFORMAT_VERSION_H */ #endif /* AVFORMAT_VERSION_H */