[FFmpeg-cvslog] lavf/mov: Support one more Avid compression id for AVCI50.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat May 28 11:57:37 2016 +0200| [a64a030ba0d13f9dc3a5d82b17053eda470b43b7] | committer: Carl Eugen Hoyos

lavf/mov: Support one more Avid compression id for AVCI50.

Reported by forum user lexidata.

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

 libavformat/mov.c     |    4 +++-
 libavformat/version.h |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index e7d17f7..57a0354 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1473,9 +1473,11 @@ static int mov_read_ares(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         if (par->codec_tag == MKTAG('A', 'V', 'i', 'n') &&
             par->codec_id == AV_CODEC_ID_H264 &&
             atom.size > 11) {
+            int cid;
             avio_skip(pb, 10);
+            cid = avio_rb16(pb);
             /* For AVID AVCI50, force width of 1440 to be able to select the correct SPS and PPS */
-            if (avio_rb16(pb) == 0xd4d)
+            if (cid == 0xd4d || cid == 0xd4e)
                 par->width = 1440;
             return 0;
         } else if (par->codec_tag == MKTAG('A', 'V', 'd', '1') &&
diff --git a/libavformat/version.h b/libavformat/version.h
index 65b99ee..d10e93e 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
 
 #define LIBAVFORMAT_VERSION_MAJOR  57
 #define LIBAVFORMAT_VERSION_MINOR  37
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MICRO 101
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \