Ticket #4251: libavformat-quicktime-32bit-audio-fix.diff

libavformat/mov.c

@@ -1363 +1363 @@
 }
 
 static void mov_parse_stsd_audio(MOVContext *c, AVIOContext *pb,
-                                 AVStream *st, MOVStreamContext *sc)
+                                 AVStream *st, MOVStreamContext *sc, int is_pcm)
 {
     int bits_per_sample, flags;
     uint16_t version = avio_rb16(pb);
@@ -1388 +1388 @@
 
         if (version == 1) {
             sc->samples_per_frame = avio_rb32(pb);
-            avio_rb32(pb); /* bytes per packet */
+            if (is_pcm)
+            {
+                // hack hack hack because Apple screwed us with QT3
+                st->codec->bits_per_coded_sample = avio_rb32(pb) * 8;
+                st->codec->codec_id = ff_mov_get_lpcm_codec_id(st->codec->bits_per_coded_sample,
+                                                               0x06);  // signed, big-endian
+            }
+            else
+            {
+                avio_rb32(pb); /* bytes per packet */
+            }
             sc->bytes_per_frame = avio_rb32(pb);
             avio_rb32(pb); /* bytes per sample */
         } else if (version == 2) {
@@ -1709 +1719 @@
             mov_parse_stsd_video(c, pb, st, sc);
         } else if (st->codec->codec_type==AVMEDIA_TYPE_AUDIO) {
             st->codec->codec_id = id;
-            mov_parse_stsd_audio(c, pb, st, sc);
+            int is_pcm = (format == MKTAG('l','p','c','m'));
+            mov_parse_stsd_audio(c, pb, st, sc, is_pcm);
         } else if (st->codec->codec_type==AVMEDIA_TYPE_SUBTITLE){
             st->codec->codec_id = id;
             mov_parse_stsd_subtitle(c, pb, st, sc,