aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorJohn Stebbins <stebbins@jetheaddev.com>2013-11-25 15:57:28 -0800
committerAnton Khirnov <anton@khirnov.net>2013-11-26 08:37:22 +0100
commit1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025 (patch)
tree2b5210775825b041a9b6c3f6ea4affee9e373e90 /libavutil
parenta16577d9857206089fd8bce6a342b31dbd7fb9b0 (diff)
downloadffmpeg-1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025.tar.gz
mpeg12dec: Extract CC user data into frame side data
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/frame.h6
-rw-r--r--libavutil/version.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h
index 449a6b799b..d869d83902 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -35,6 +35,12 @@ enum AVFrameSideDataType {
* The data is the AVPanScan struct defined in libavcodec.
*/
AV_FRAME_DATA_PANSCAN,
+ /**
+ * ATSC A53 Part 4 Closed Captions.
+ * A53 CC bitstream is stored as uint8_t in AVFrameSideData.data.
+ * The number of bytes of CC data is AVFrameSideData.size.
+ */
+ AV_FRAME_DATA_A53_CC,
};
typedef struct AVFrameSideData {
diff --git a/libavutil/version.h b/libavutil/version.h
index 4f0f469c62..fa1f53b66b 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -37,7 +37,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 52
-#define LIBAVUTIL_VERSION_MINOR 18
+#define LIBAVUTIL_VERSION_MINOR 19
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \