diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-08-16 19:34:13 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2015-08-18 11:48:49 -0400 |
| commit | 6471040f5650ad8c06e8fe285325b41db5bef75e (patch) | |
| tree | 0605c3ff099ca1832de373b8444faa2659aea443 /libavformat | |
| parent | 229843aa359ae0c9519977d7fa952688db63f559 (diff) | |
FF_OPT_TYPE_* -> AV_OPT_TYPE_*.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/hls.c | 2 | ||||
| -rw-r--r-- | libavformat/mov.c | 6 | ||||
| -rw-r--r-- | libavformat/tedcaptionsdec.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index 4691a60502..caecbdec9c 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1812,7 +1812,7 @@ static int hls_probe(AVProbeData *p) #define FLAGS AV_OPT_FLAG_DECODING_PARAM static const AVOption hls_options[] = { {"live_start_index", "segment index to start live streams at (negative values are from the end)", - OFFSET(live_start_index), FF_OPT_TYPE_INT, {.i64 = -3}, INT_MIN, INT_MAX, FLAGS}, + OFFSET(live_start_index), AV_OPT_TYPE_INT, {.i64 = -3}, INT_MIN, INT_MAX, FLAGS}, {NULL} }; diff --git a/libavformat/mov.c b/libavformat/mov.c index aa89a5e389..efde072c38 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4690,17 +4690,17 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti static const AVOption mov_options[] = { {"use_absolute_path", "allow using absolute path when opening alias, this is a possible security issue", - OFFSET(use_absolute_path), FF_OPT_TYPE_INT, {.i64 = 0}, + OFFSET(use_absolute_path), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, FLAGS}, {"seek_streams_individually", "Seek each stream individually to the to the closest point", OFFSET(seek_individually), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, FLAGS}, - {"ignore_editlist", "", OFFSET(ignore_editlist), FF_OPT_TYPE_INT, {.i64 = 0}, + {"ignore_editlist", "", OFFSET(ignore_editlist), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, FLAGS}, {"use_mfra_for", "use mfra for fragment timestamps", - OFFSET(use_mfra_for), FF_OPT_TYPE_INT, {.i64 = FF_MOV_FLAG_MFRA_AUTO}, + OFFSET(use_mfra_for), AV_OPT_TYPE_INT, {.i64 = FF_MOV_FLAG_MFRA_AUTO}, -1, FF_MOV_FLAG_MFRA_PTS, FLAGS, "use_mfra_for"}, {"auto", "auto", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_MFRA_AUTO}, 0, 0, diff --git a/libavformat/tedcaptionsdec.c b/libavformat/tedcaptionsdec.c index fb578ebc03..d6020d9e35 100644 --- a/libavformat/tedcaptionsdec.c +++ b/libavformat/tedcaptionsdec.c @@ -34,7 +34,7 @@ typedef struct { static const AVOption tedcaptions_options[] = { { "start_time", "set the start time (offset) of the subtitles, in ms", - offsetof(TEDCaptionsDemuxer, start_time), FF_OPT_TYPE_INT64, + offsetof(TEDCaptionsDemuxer, start_time), AV_OPT_TYPE_INT64, { .i64 = 15000 }, INT64_MIN, INT64_MAX, AV_OPT_FLAG_SUBTITLE_PARAM | AV_OPT_FLAG_DECODING_PARAM }, { NULL }, |