diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-12 15:12:05 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-12 15:12:05 +0200 |
| commit | 580c4fc98a213ff56ec95f95c30dde81cb7ef46c (patch) | |
| tree | e540b1dbb8df192953f6f4e1e91fefefc001212d /libavcodec/options_table.h | |
| parent | 141637002767d47154bffaf1463edcfd9445a5ee (diff) | |
| parent | 6064f697a321174232a3fad351afb21150c3e9e5 (diff) | |
| download | ffmpeg-580c4fc98a213ff56ec95f95c30dde81cb7ef46c.tar.gz | |
Merge commit '6064f697a321174232a3fad351afb21150c3e9e5'
* commit '6064f697a321174232a3fad351afb21150c3e9e5':
lavc: Enable side data only packets by default
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/options_table.h')
| -rw-r--r-- | libavcodec/options_table.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 1d781e8a2c..d86c0c071d 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -490,7 +490,9 @@ static const AVOption avcodec_options[] = { {"auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_AUTOMATIC}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"}, {"pre_decoder", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_PRE_DECODER}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"}, {"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, A|V|D }, -{"side_data_only_packets", NULL, OFFSET(side_data_only_packets), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, A|V|E }, +#if FF_API_SIDEDATA_ONLY_PKT +{"side_data_only_packets", NULL, OFFSET(side_data_only_packets), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, A|V|E }, +#endif {"skip_alpha", "Skip processing alpha", OFFSET(skip_alpha), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, V|D }, {"field_order", "Field order", OFFSET(field_order), AV_OPT_TYPE_INT, {.i64 = AV_FIELD_UNKNOWN }, 0, 5, V|D|E, "field_order" }, {"progressive", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AV_FIELD_PROGRESSIVE }, 0, 0, V|D|E, "field_order" }, |