From d1e750cd512a49a080424379e1e03ec935277b39 Mon Sep 17 00:00:00 2001 From: Marek Fort Date: Thu, 7 Aug 2014 14:27:19 +0200 Subject: [PATCH] avformat/mov: Support reading Avid's metadata for DNXHD codec. The AALP atom is necessary to properly decode the alpha channel. Needed for ticket #3707 Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index ec554c6f2f..b2ef482ce2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1007,7 +1007,10 @@ static int mov_read_jp2h(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_avid(MOVContext *c, AVIOContext *pb, MOVAtom atom) { - return mov_read_extradata(c, pb, atom, AV_CODEC_ID_AVUI); + int ret = mov_read_extradata(c, pb, atom, AV_CODEC_ID_AVUI); + if(ret == 0) + ret = mov_read_extradata(c, pb, atom, AV_CODEC_ID_DNXHD); + return ret; } static int mov_read_targa_y216(MOVContext *c, AVIOContext *pb, MOVAtom atom)