Mercurial > mplayer.hg

changeset 34796:a8e554318057

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mencoder: Fix hang with -ovc copy or -ovc frameno. It was introduced in r34860.
author reimar
date Wed, 02 May 2012 18:57:24 +0000
parents 5db60dfcf520
children 079b53acda6d
files mencoder.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mencoder.c	Mon Apr 30 10:20:10 2012 +0000
+++ b/mencoder.c	Wed May 02 18:57:24 2012 +0000
@@ -1400,7 +1400,9 @@
 
     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;