Ticket #1271: mencoder_03_joint_av_eof.diff

mencoder.c

@@ -1120 +1120 @@
 
 if(sh_audio){
     // get audio:
-    while(!sh_video || mux_a->timer-audio_preload<mux_v->timer){
+    while(!sh_video || mux_a->timer-audio_preload<mux_v->timer || d_video->eof){
         float tottime;
         int len=0;
 
@@ -1201 +1201 @@
                 }
             }
         }
-        if(len<=0) {
-            if(!sh_video) at_eof=1;
-            break; // EOF?
-        }
         muxer_write_chunk(mux_a,len,0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
         if(!mux_a->h.dwSampleSize && mux_a->timer>0)
             mux_a->wf->nAvgBytesPerSec=0.5f+(double)mux_a->size/mux_a->timer; // avg bps (VBR)
@@ -1217 +1213 @@
         audiosamples++;
         audiorate+= (GetTimerMS() - ptimer_start);
 
+        if(d_audio->eof) {
+            if(!sh_video) at_eof=1;
+            break;
+        }
     }
 }
 
@@ -1228 +1228 @@
         sh_video->timer+=frame_data.frame_time;
     }
     frame_data.frame_time /= playback_speed;
-    if(frame_data.in_size<0){ at_eof=1; break; }
+    if (d_video->eof) {
+      if (!sh_audio || d_audio->eof)
+        at_eof=1;
+      continue;
+    }
     ++decoded_frameno;
 
     v_timer_corr-=frame_data.frame_time-(float)mux_v->h.dwScale/mux_v->h.dwRate;