[MPlayer-dev-eng] fix for using -hr-edl-seek and -ovc copy with mencoder

[Guillaume POIRIER]

Hi,

On 3/18/07, Oded Shimon <ods15 at ods15.dyndns.org> wrote:
> On Sun, Mar 18, 2007 at 06:18:00PM +0100, Guillaume POIRIER wrote:
> > Oded, could you look at the attached patch? EDL is your baby....
>
> ...
>
> > Index: mencoder.c
> > ===================================================================
> > --- mencoder.c        (revision 22100)
> > +++ mencoder.c        (working copy)
> > @@ -1684,8 +1684,11 @@
> >          a_pts = forward_audio(sh_video->pts - frame_data->frame_time + audio_delay, d_audio, mux_a);
> >
> >          if (done) {
> > -            frame_data->already_read = 1;
> > -            if (!framecopy || (sh_video->ds->flags & 1)) return 1;
> > +         /* In copy mode, wait for a keyframe before stopping */
> > +            if (!framecopy || (sh_video->ds->flags & 1)) {
> > +             frame_data->already_read = 1;
> > +             return 1;
> > +         }
> >          }
> >          if (sh_video->pts >= end_pts) done = 1;
> >
>
> ... It... is already committed .... :) from some weeks ago. i think this
> patch was submitted twice :)

I'm sorry. I had grepped for "In copy mode" in mencoder.c, and it
wasn't there, so I assumed it wasn't committed.
Thanks for looking at it!

Guillaume