summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorKarthick J <kjeyapal@akamai.com>2017-08-30 11:43:16 +0530
committerMarton Balint <cus@passwd.hu>2017-09-28 21:06:12 +0200
commitb6cf66ae1c4986f6d788a17233a6609b346c6aa6 (patch)
tree58c3df28710d04585d10ec89be612a4670c856ba /libavcodec
parenta8755785d7a940eace06ed5397d51cb779213749 (diff)
downloadffmpeg-b6cf66ae1c4986f6d788a17233a6609b346c6aa6.tar.gz
avdevice/decklink_dec: Added Closed caption decode from VANC
Signed-off-by: Karthick J <kjeyapal@akamai.com> Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/avcodec.h7
-rw-r--r--libavcodec/avpacket.c1
-rw-r--r--libavcodec/version.h2
3 files changed, 9 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index b5bbc591ac..dd7c4b4ce5 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1600,6 +1600,13 @@ enum AVPacketSideDataType {
AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
/**
+ * ATSC A53 Part 4 Closed Captions. This metadata should be associated with
+ * a video stream. A53 CC bitstream is stored as uint8_t in AVPacketSideData.data.
+ * The number of bytes of CC data is AVPacketSideData.size.
+ */
+ AV_PKT_DATA_A53_CC,
+
+ /**
* The number of side data elements (in fact a bit more than it).
* This is not part of the public API/ABI in the sense that it may
* change when new side data types are added.
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index b07180eac8..d1f4ea9eb3 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -387,6 +387,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type)
case AV_PKT_DATA_MASTERING_DISPLAY_METADATA: return "Mastering display metadata";
case AV_PKT_DATA_CONTENT_LIGHT_LEVEL: return "Content light level metadata";
case AV_PKT_DATA_SPHERICAL: return "Spherical Mapping";
+ case AV_PKT_DATA_A53_CC: return "A53 Closed Captions";
}
return NULL;
}
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 39d9ad992c..7aee6f9cf3 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 106
-#define LIBAVCODEC_VERSION_MICRO 103
+#define LIBAVCODEC_VERSION_MICRO 104
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \