[MPlayer-cvslog] r34884 - trunk/mencoder.c

[reimar]

Author: reimar
Date: Wed May  2 20:57:24 2012
New Revision: 34884

Log:
mencoder: Fix hang with -ovc copy or -ovc frameno.

It was introduced in r34860.

Modified:
   trunk/mencoder.c

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Mon Apr 30 12:20:10 2012	(r34883)
+++ trunk/mencoder.c	Wed May  2 20:57:24 2012	(r34884)
@@ -1400,7 +1400,9 @@ if(sh_audio){
 
     if (!frame_data.already_read) {
         frame_data.in_size=video_read_frame(sh_video,&frame_data.frame_time,&frame_data.start,force_fps);
-        frame_data.flush = frame_data.in_size < 0 && d_video->eof;
+        frame_data.flush = frame_data.in_size < 0 && d_video->eof &&
+                           mux_v->codec != VCODEC_COPY &&
+                           mux_v->codec != VCODEC_FRAMENO;
         if (frame_data.flush) {
             frame_data.in_size = 0;
             frame_data.start = NULL;