Ticket #364: mplayer.silent-mp4.patch

libmpdemux/demux_mov.c

@@ -196 +196 @@
     }
 
     // workaround for fixed-size video frames (dv and uncompressed)
-    if(!trak->samples_size && trak->type!=MOV_TRAK_AUDIO){
+    // and fixed-size chunks of framed audio codec
+    if(!trak->samples_size && (trak->type!=MOV_TRAK_AUDIO || trak->samplesize != 1)){
         trak->samples_size=s;
         trak->samples=malloc(sizeof(mov_sample_t)*s);
         for(i=0;i<s;i++)
@@ -1841 +1842 @@
     pts=(float)(trak->chunks[trak->pos].sample*trak->duration)/(float)trak->timescale;
     if(trak->samplesize!=1)
     {
+        /* this should now be unreachable, as we always build an index
+           when samplesize != 1 */
         mp_msg(MSGT_DEMUX, MSGL_DBG2, "WARNING! Samplesize(%d) != 1\n",
             trak->samplesize);
         x=trak->chunks[trak->pos].size*trak->samplesize;