summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorKieran Kunhya <kierank@obe.tv>2014-08-03 19:24:56 +0100
committerDiego Biurrun <diego@biurrun.de>2014-08-03 15:43:02 -0700
commit1ef9e8376466bb1e2c147e47554b94cab9c8b04a (patch)
treeeccb333b18ff0e037c9b2956f12e752ade4ef0c5 /libavutil
parentd0393d79bc3d61c9f2ff832c0e273b7774ff0269 (diff)
avcodec: Deprecate dtg_active_format field in favor of avframe side-data
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/frame.h15
-rw-r--r--libavutil/version.h2
2 files changed, 16 insertions, 1 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h
index b2159d3cc3..8136fb570d 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -82,6 +82,21 @@ enum AVFrameSideDataType {
* See libavutil/display.h for a detailed description of the data.
*/
AV_FRAME_DATA_DISPLAYMATRIX,
+ /**
+ * Active Format Description data consisting of a single byte as specified
+ * in ETSI TS 101 154 using enum AVActiveFormatDescription.
+ */
+ AV_FRAME_DATA_AFD,
+};
+
+enum AVActiveFormatDescription {
+ AV_AFD_SAME = 8,
+ AV_AFD_4_3 = 9,
+ AV_AFD_16_9 = 10,
+ AV_AFD_14_9 = 11,
+ AV_AFD_4_3_SP_14_9 = 13,
+ AV_AFD_16_9_SP_14_9 = 14,
+ AV_AFD_SP_4_3 = 15,
};
typedef struct AVFrameSideData {
diff --git a/libavutil/version.h b/libavutil/version.h
index e981948b3f..820fdc6cf7 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -54,7 +54,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 53
-#define LIBAVUTIL_VERSION_MINOR 19
+#define LIBAVUTIL_VERSION_MINOR 20
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \