[MPlayer-dev-eng] [PATCH] support for hardware mjpeg encoding in tvi_v4l.c (version 3)

[Michael Niedermayer]

Hi

On Tuesday 18 March 2003 23:55, Ivan Szanto wrote:
> Hi,
>
> On Tue, 18 Mar 2003, Jindrich Makovicka wrote:
> > Arpi wrote:
> > >Hi,
> > >
> > >>>may I kindly remind you of what you wrote?
> > >>
> > >>hehe he always says that but never says which weekend :)
> > >>
> > >>anyway i looked your patch and looks ok to me, so imho if no objections
> > >> then
> > >
> > >but note, that i don't know the demux_tv/tvi interface enough to decode
> > > if it's (card setup, tuning etc) really ok, but the rest (sh_video
> > > stuff) was ok
> >
> > I have no objections too. Although I am unable to test the code, it is
> > looks orthogonal to the current one so it shouldn't do any harm at least.
>
> Great! then noone has any objections! so
> who gonna be "The Brave" to commit it?
> I like A'rpi's reference to Michael's suggestion about applying it after a
> week without any objections ;-)
>
>
> BTW, Jindrich's recent changes rendered the patch such, that it probably
> cannot be applied automatically against the current CVS. When I try to
> apply it locally, it tells me this:
>
> {kvz063% szivan} patch -p 1 < ../tv-v4l-mjpeg.patch-v3
> patching file libmpdemux/tv.c
> patching file libmpdemux/tv.h
> patching file libmpdemux/tvi_v4l.c
> Hunk #3 succeeded at 136 (offset 4 lines).
> Hunk #4 succeeded at 448 (offset 5 lines).
> Hunk #5 succeeded at 568 (offset 5 lines).
> Hunk #6 succeeded at 596 (offset 5 lines).
> Hunk #7 succeeded at 652 (offset 5 lines).
> Hunk #8 succeeded at 671 (offset 5 lines).
> Hunk #9 succeeded at 766 (offset 7 lines).
> Hunk #10 succeeded at 777 (offset 7 lines).
> Hunk #11 succeeded at 962 (offset 19 lines).
> Hunk #12 FAILED at 1382.
> Hunk #13 succeeded at 1437 (offset 30 lines).
> Hunk #14 succeeded at 1550 (offset 47 lines).
> 1 out of 14 hunks FAILED -- saving rejects to file
> libmpdemux/tvi_v4l.c.rej
> patching file DOCS/en/mplayer.1
> patching file cfg-common.h
> Hunk #1 succeeded at 286 (offset 7 lines).
> {kvz063% szivan}
>
>
> Shall I send a new version of the patch, or "The Brave" will
> be able to apply that "Hunk #12" by hand? Of course, I see
> little sense in sending the new version, unless someone is
> willing to apply it ...
just tried (with patch -F3)

tv.c: In function `open_tv':
tv.c:186: `tv_param_mjpeg' undeclared (first use in this function)
tv.c:186: (Each undeclared identifier is reported only once
tv.c:186: for each function it appears in.)
tv.c:191: `tv_param_decimation' undeclared (first use in this function)
make: *** [tv.o] Error 1

[...]

Michael