[FFmpeg-cvslog] Read QuickTime version 1 audio fields in broken mov files.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Nov 15 14:38:19 2012 +0100| [850e5c041d7e96e23a7ae2b002f244e4e4acda96] | committer: Carl Eugen Hoyos

Read QuickTime version 1 audio fields in broken mov files.

Matrox XMIO capture boards write files with major brand "JUNK"
and compatible brand "qt  " that contain QuickTime version 1
audio fields.

Fixes ticket #1881.

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

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 01c9413..73077ee 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1397,7 +1397,8 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
 
             //Read QT version 1 fields. In version 0 these do not exist.
             av_dlog(c->fc, "version =%d, isom =%d\n",version,c->isom);
-            if (!c->isom) {
+            if (!c->isom ||
+                strstr(av_dict_get(c->fc->metadata, "compatible_brands", NULL, AV_DICT_MATCH_CASE)->value, "qt  ")) {
                 if (version==1) {
                     sc->samples_per_frame = avio_rb32(pb);
                     avio_rb32(pb); /* bytes per packet */