summaryrefslogtreecommitdiff
path: root/libavcodec/options_table.h
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-05-08 13:11:17 -0300
committerJames Almer <jamrial@gmail.com>2017-05-08 14:22:43 -0300
commitf089e02fa2b7716d9fa5228c734e55678437db85 (patch)
treeff8ec50c447f2e23dadf83535093655d96ebe5e0 /libavcodec/options_table.h
parenta47bd5d77e3f1dd8bb3d4ba0955bd7b1323c7d83 (diff)
parent019ab88a95cb31b698506d90e8ce56695a7f1cc5 (diff)
Merge commit '019ab88a95cb31b698506d90e8ce56695a7f1cc5'
* commit '019ab88a95cb31b698506d90e8ce56695a7f1cc5': lavc: add an option for exporting cropping information to the caller Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/options_table.h')
-rw-r--r--libavcodec/options_table.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 022cb1df5d..57a098e76e 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -561,6 +561,7 @@ static const AVOption avcodec_options[] = {
#if FF_API_SIDEDATA_ONLY_PKT
{"side_data_only_packets", NULL, OFFSET(side_data_only_packets), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, A|V|E },
#endif
+{"apply_cropping", NULL, OFFSET(apply_cropping), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, V | D },
{"skip_alpha", "Skip processing alpha", OFFSET(skip_alpha), AV_OPT_TYPE_BOOL, {.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" },