---
libavformat/mxf.c | 1 +
libavformat/mxfdec.c | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index e9c48e8..db6ce7b 100644
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -54,6 +54,7 @@ const MXFCodecUL ff_mxf_codec_uls[] = {
{ {
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x04,0x0A,0x00,0x00
}, 14, AV_CODEC_ID_VC1 }, /* VC1 AP@L4 */
{ {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00
}, 13, AV_CODEC_ID_RAWVIDEO }, /* uncompressed */
{ {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x01,0x00
}, 15, AV_CODEC_ID_RAWVIDEO }, /* uncompressed 422 8-bit */
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x02,0x02,0x71,0x00,0x00,0x00
}, 13, AV_CODEC_ID_DNXHR }, /* DNxHR */
{ {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x71,0x00,0x00,0x00
}, 13, AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */
{ {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x02,0x00,0x00
}, 14, AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */
{ {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0E,0x04,0x02,0x01,0x02,0x04,0x01,0x00
}, 16, AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD Legacy Avid Media Composer
MXF */
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 0affca9..8f2f10a 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1098,6 +1098,10 @@ static int mxf_match_uid(const UID key, const UID uid,
int len)
static const MXFCodecUL *mxf_get_codec_ul(const MXFCodecUL *uls, UID *uid)
{
while (uls->uid[0]) {
+ /* match version byte for dnxhr */
+ if (uls->id == AV_CODEC_ID_DNXHR && !memcmp(uls->uid, *uid,
uls->matching_len))
+ break;
+
if(mxf_match_uid(uls->uid, *uid, uls->matching_len))
break;
uls++;
--
2.7.3
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
