diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-06-18 09:28:49 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-07-08 18:39:28 +0200 |
| commit | 6002fdef5eba7ecc623092583d5bb051c8a27318 (patch) | |
| tree | 10cf54f3ae775f3468aeddd1b66d3e77a7333af6 /libavformat/img2.c | |
| parent | a726d7fd4e0b112b276678ea9da9c9b3097e8b8f (diff) | |
img2: add loop private option.
Deprecate AVFormatContext.loop_input.
Diffstat (limited to 'libavformat/img2.c')
| -rw-r--r-- | libavformat/img2.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 4eef62371d..a4f39e7256 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -42,6 +42,7 @@ typedef struct { char *pixel_format; /**< Set by a private option. */ char *video_size; /**< Set by a private option. */ char *framerate; /**< Set by a private option. */ + int loop; } VideoData; typedef struct { @@ -243,6 +244,11 @@ static int read_header(AVFormatContext *s1, AVFormatParameters *ap) framerate = (AVRational){ap->time_base.den, ap->time_base.num}; #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)); s->img_number = 0; s->img_count = 0; @@ -300,7 +306,7 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt) if (!s->is_pipe) { /* 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; } 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 }, { "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 }, + { "loop", "", OFFSET(loop), FF_OPT_TYPE_INT, {.dbl = 0}, 0, 1, DEC }, { NULL }, }; |