aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMatthias Hunstock <atze@fem.tu-ilmenau.de>2016-08-09 14:15:38 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-08-11 02:09:16 +0200
commitb83d9077807a5cde4db5f4d726e0a02c787651cb (patch)
tree0d810f69d00a99219bca07c8da13f820ac7579d6 /libavformat
parent16ea0bca14730d71dd319b7dc148598275928cfe (diff)
downloadffmpeg-b83d9077807a5cde4db5f4d726e0a02c787651cb.tar.gz
libavformat/mxfenc: add UID for unconstrained H.264 coded video in baseline profile
Enable the MXF muxer to mux baseline H.264 video streams. Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mxfenc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index ffd0bf2d16..7733ef8077 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -352,6 +352,7 @@ static const uint8_t multiple_desc_ul[] = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x
/**
* SMPTE RP210 http://www.smpte-ra.org/mdd/index.html
+ * https://smpte-ra.org/sites/default/files/Labels.xml
*/
static const MXFLocalTagPair mxf_local_tag_batch[] = {
// preface set
@@ -1822,6 +1823,7 @@ static const struct {
int profile;
uint8_t interlaced;
} mxf_h264_codec_uls[] = {
+ {{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x31,0x11,0x01 }, 0, 66, 0 }, // AVC Baseline, Unconstrained Coding
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x20,0x01 }, 0, 110, 0 }, // AVC High 10 Intra
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x01 }, 232960, 0, 1 }, // AVC Intra 50 1080i60
{{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x32,0x21,0x02 }, 281088, 0, 1 }, // AVC Intra 50 1080i50