mirror of https://git.ffmpeg.org/ffmpeg.git
FF_OPT_TYPE_* -> AV_OPT_TYPE_*.
This commit is contained in:
Ronald S. Bultje
parent
229843aa35
commit
6471040f56
|
|
@ -1718,9 +1718,9 @@ end:
|
|||
|
||||
#define DS AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_SUBTITLE_PARAM
|
||||
static const AVOption options[] = {
|
||||
{"compute_edt", "compute end of time using pts or timeout", offsetof(DVBSubContext, compute_edt), FF_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DS},
|
||||
{"compute_clut", "compute clut when not available(-1) or always(1) or never(0)", offsetof(DVBSubContext, compute_clut), FF_OPT_TYPE_INT, {.i64 = -1}, -1, 1, DS},
|
||||
{"dvb_substream", "", offsetof(DVBSubContext, substream), FF_OPT_TYPE_INT, {.i64 = -1}, -1, 63, DS},
|
||||
{"compute_edt", "compute end of time using pts or timeout", offsetof(DVBSubContext, compute_edt), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DS},
|
||||
{"compute_clut", "compute clut when not available(-1) or always(1) or never(0)", offsetof(DVBSubContext, compute_clut), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 1, DS},
|
||||
{"dvb_substream", "", offsetof(DVBSubContext, substream), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 63, DS},
|
||||
{NULL}
|
||||
};
|
||||
static const AVClass dvbsubdec_class = {
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
|
|||
}
|
||||
|
||||
static const AVOption frwu_options[] = {
|
||||
{"change_field_order", "Change field order", offsetof(FRWUContext, change_field_order), FF_OPT_TYPE_INT,
|
||||
{"change_field_order", "Change field order", offsetof(FRWUContext, change_field_order), AV_OPT_TYPE_INT,
|
||||
{.i64 = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM},
|
||||
{NULL}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1943,8 +1943,8 @@ static av_cold int h264_decode_end(AVCodecContext *avctx)
|
|||
#define OFFSET(x) offsetof(H264Context, x)
|
||||
#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
|
||||
static const AVOption h264_options[] = {
|
||||
{"is_avc", "is avc", offsetof(H264Context, is_avc), FF_OPT_TYPE_INT, {.i64 = 0}, 0, 1, 0},
|
||||
{"nal_length_size", "nal_length_size", offsetof(H264Context, nal_length_size), FF_OPT_TYPE_INT, {.i64 = 0}, 0, 4, 0},
|
||||
{"is_avc", "is avc", offsetof(H264Context, is_avc), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, 0},
|
||||
{"nal_length_size", "nal_length_size", offsetof(H264Context, nal_length_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 4, 0},
|
||||
{ "enable_er", "Enable error resilience on damaged frames (unsafe)", OFFSET(enable_er), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VD },
|
||||
{ NULL },
|
||||
};
|
||||
|
|
|
|||
|
|
@ -985,9 +985,9 @@ static int vp8_encode(AVCodecContext *avctx, AVPacket *pkt,
|
|||
#define LEGACY_OPTIONS \
|
||||
{"speed", "", offsetof(VP8Context, cpu_used), AV_OPT_TYPE_INT, {.i64 = 1}, -16, 16, VE}, \
|
||||
{"quality", "", offsetof(VP8Context, deadline), AV_OPT_TYPE_INT, {.i64 = VPX_DL_GOOD_QUALITY}, INT_MIN, INT_MAX, VE, "quality"}, \
|
||||
{"vp8flags", "", offsetof(VP8Context, flags), FF_OPT_TYPE_FLAGS, {.i64 = 0}, 0, UINT_MAX, VE, "flags"}, \
|
||||
{"error_resilient", "enable error resilience", 0, FF_OPT_TYPE_CONST, {.dbl = VP8F_ERROR_RESILIENT}, INT_MIN, INT_MAX, VE, "flags"}, \
|
||||
{"altref", "enable use of alternate reference frames (VP8/2-pass only)", 0, FF_OPT_TYPE_CONST, {.dbl = VP8F_AUTO_ALT_REF}, INT_MIN, INT_MAX, VE, "flags"}, \
|
||||
{"vp8flags", "", offsetof(VP8Context, flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, UINT_MAX, VE, "flags"}, \
|
||||
{"error_resilient", "enable error resilience", 0, AV_OPT_TYPE_CONST, {.dbl = VP8F_ERROR_RESILIENT}, INT_MIN, INT_MAX, VE, "flags"}, \
|
||||
{"altref", "enable use of alternate reference frames (VP8/2-pass only)", 0, AV_OPT_TYPE_CONST, {.dbl = VP8F_AUTO_ALT_REF}, INT_MIN, INT_MAX, VE, "flags"}, \
|
||||
{"arnr_max_frames", "altref noise reduction max frame count", offsetof(VP8Context, arnr_max_frames), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 15, VE}, \
|
||||
{"arnr_strength", "altref noise reduction filter strength", offsetof(VP8Context, arnr_strength), AV_OPT_TYPE_INT, {.i64 = 3}, 0, 6, VE}, \
|
||||
{"arnr_type", "altref noise reduction filter type", offsetof(VP8Context, arnr_type), AV_OPT_TYPE_INT, {.i64 = 3}, 1, 3, VE}, \
|
||||
|
|
|
|||
|
|
@ -2757,8 +2757,8 @@ static const AVProfile mpeg4_video_profiles[] = {
|
|||
};
|
||||
|
||||
static const AVOption mpeg4_options[] = {
|
||||
{"quarter_sample", "1/4 subpel MC", offsetof(MpegEncContext, quarter_sample), FF_OPT_TYPE_INT, {.i64 = 0}, 0, 1, 0},
|
||||
{"divx_packed", "divx style packed b frames", offsetof(MpegEncContext, divx_packed), FF_OPT_TYPE_INT, {.i64 = 0}, 0, 1, 0},
|
||||
{"quarter_sample", "1/4 subpel MC", offsetof(MpegEncContext, quarter_sample), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, 0},
|
||||
{"divx_packed", "divx style packed b frames", offsetof(MpegEncContext, divx_packed), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, 0},
|
||||
{NULL}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -203,11 +203,11 @@ static int s302m_decode_frame(AVCodecContext *avctx, void *data,
|
|||
|
||||
#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_DECODING_PARAM
|
||||
static const AVOption s302m_options[] = {
|
||||
{"non_pcm_mode", "Chooses what to do with NON-PCM", offsetof(S302Context, non_pcm_mode), FF_OPT_TYPE_INT, {.i64 = 3}, 0, 3, FLAGS, "non_pcm_mode"},
|
||||
{"copy" , "Pass NON-PCM through unchanged" , 0, FF_OPT_TYPE_CONST, {.i64 = 0}, 0, 3, FLAGS, "non_pcm_mode"},
|
||||
{"drop" , "Drop NON-PCM" , 0, FF_OPT_TYPE_CONST, {.i64 = 1}, 0, 3, FLAGS, "non_pcm_mode"},
|
||||
{"decode_copy" , "Decode if possible else passthrough", 0, FF_OPT_TYPE_CONST, {.i64 = 2}, 0, 3, FLAGS, "non_pcm_mode"},
|
||||
{"decode_drop" , "Decode if possible else drop" , 0, FF_OPT_TYPE_CONST, {.i64 = 3}, 0, 3, FLAGS, "non_pcm_mode"},
|
||||
{"non_pcm_mode", "Chooses what to do with NON-PCM", offsetof(S302Context, non_pcm_mode), AV_OPT_TYPE_INT, {.i64 = 3}, 0, 3, FLAGS, "non_pcm_mode"},
|
||||
{"copy" , "Pass NON-PCM through unchanged" , 0, AV_OPT_TYPE_CONST, {.i64 = 0}, 0, 3, FLAGS, "non_pcm_mode"},
|
||||
{"drop" , "Drop NON-PCM" , 0, AV_OPT_TYPE_CONST, {.i64 = 1}, 0, 3, FLAGS, "non_pcm_mode"},
|
||||
{"decode_copy" , "Decode if possible else passthrough", 0, AV_OPT_TYPE_CONST, {.i64 = 2}, 0, 3, FLAGS, "non_pcm_mode"},
|
||||
{"decode_drop" , "Decode if possible else drop" , 0, AV_OPT_TYPE_CONST, {.i64 = 3}, 0, 3, FLAGS, "non_pcm_mode"},
|
||||
{NULL}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
|
|||
|
||||
#define V210DEC_FLAGS AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM
|
||||
static const AVOption v210dec_options[] = {
|
||||
{"custom_stride", "Custom V210 stride", offsetof(V210DecContext, custom_stride), FF_OPT_TYPE_INT,
|
||||
{"custom_stride", "Custom V210 stride", offsetof(V210DecContext, custom_stride), AV_OPT_TYPE_INT,
|
||||
{.i64 = 0}, INT_MIN, INT_MAX, V210DEC_FLAGS},
|
||||
{NULL}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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 },
|
||||
|
|
|
|||
Loading…
Reference in New Issue