[FFmpeg-cvslog] avformat/mov: Support reading Avid's metadata for DNXHD codec.

[Marek Fort]

ffmpeg | branch: master | Marek Fort <marek.fort at chyronhego.com> | Thu Aug  7 14:27:19 2014 +0200| [d1e750cd512a49a080424379e1e03ec935277b39] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1e750cd512a49a080424379e1e03ec935277b39
---

 libavformat/mov.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index ec554c6..b2ef482 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)