# HG changeset patch # User reimar # Date 1335985044 0 # Node ID a8e554318057b3c3cc02834e8d453b73ba3f5c09 # Parent 5db60dfcf520ba79c0cea8290c36d1d993961ee4 mencoder: Fix hang with -ovc copy or -ovc frameno. It was introduced in r34860. diff -r 5db60dfcf520 -r a8e554318057 mencoder.c --- 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;