aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/matroska.h
diff options
context:
space:
mode:
authorVignesh Venkatasubramanian <vigneshv@google.com>2013-02-13 13:51:48 -0800
committerMichael Niedermayer <michaelni@gmx.at>2013-02-14 00:46:28 +0100
commit30c5c45b123c45ede70988088528a2de6c869c3f (patch)
tree2a2d042f6ae4d52d03d149adc4dbfa9ce662fb81 /libavformat/matroska.h
parent701e9b82547c6fa72acfb91c86bf29c40722f154 (diff)
downloadandroid_external_ffmpeg-30c5c45b123c45ede70988088528a2de6c869c3f.tar.gz
android_external_ffmpeg-30c5c45b123c45ede70988088528a2de6c869c3f.tar.bz2
android_external_ffmpeg-30c5c45b123c45ede70988088528a2de6c869c3f.zip
Adding support for parsing BlockAdditional
Matroska specification lists support for BlockAdditional element which is not supported by ffmpeg's matroska parser. This patch adds grammar definitions for parsing that element (and few other related elements) and then puts the data in AVPacket.side_data with new AVPacketSideDataType AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.h')
-rw-r--r--libavformat/matroska.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index 8411633f0a..769fe5445a 100644
--- a/libavformat/matroska.h
+++ b/libavformat/matroska.h
@@ -175,6 +175,10 @@
#define MATROSKA_ID_CLUSTERPOSITION 0xA7
#define MATROSKA_ID_CLUSTERPREVSIZE 0xAB
#define MATROSKA_ID_BLOCKGROUP 0xA0
+#define MATROSKA_ID_BLOCKADDITIONS 0x75A1
+#define MATROSKA_ID_BLOCKMORE 0xA6
+#define MATROSKA_ID_BLOCKADDID 0xEE
+#define MATROSKA_ID_BLOCKADDITIONAL 0xA5
#define MATROSKA_ID_SIMPLEBLOCK 0xA3
/* IDs in the blockgroup master */