summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Fort <marek.fort@chyronhego.com>2014-08-07 14:27:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-08 18:39:04 +0200
commitd1e750cd512a49a080424379e1e03ec935277b39 (patch)
tree906b70d847ea8fe6da57d783aa4d3a25d74cabc9
parentf73d75384f1d270eb12542940640d9bee50033e0 (diff)
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 <michaelni@gmx.at>
-rw-r--r--libavformat/mov.c5
1 files changed, 4 insertions, 1 deletions
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)