[MPlayer-dev-eng] [PATCH] '-priority' support on OS/2

Diego Biurrun diego at biurrun.de
Mon Feb 9 16:17:53 CET 2009


On Mon, Feb 09, 2009 at 10:30:26PM +0900, KO Myung-Hun wrote:
>
> [...]

Your patch does not apply:

diego at cerebus:~/src/mplayer/mplayer$ patch --dry-run -p0 -i /tmp/priority.diff 
patching file Makefile
patching file configure
patching file DOCS/man/en/mplayer.1
patching file mplayer.c
Hunk #2 FAILED at 2596.
1 out of 2 hunks FAILED -- saving rejects to file mplayer.c.rej
patching file osdep/priority.c
patching file osdep/priority.h
patching file cfg-common.h
patching file cfg-common-opts.h
Hunk #1 succeeded at 3 with fuzz 2.
Hunk #2 FAILED at 19.
1 out of 2 hunks FAILED -- saving rejects to file cfg-common-opts.h.rej
patching file mencoder.c
Hunk #2 FAILED at 481.
1 out of 2 hunks FAILED -- saving rejects to file mencoder.c.rej


> --- configure	(revision 28494)
> +++ configure   (working copy)
> @@ -718,9 +722,11 @@
>  def_pthread_cache="#undef PTHREAD_CACHE"
> +def_priority="#undef CONFIG_PRIORITY"

Set this to 0 here, then..

> --- mplayer.c	(revision 28494)
> +++ mplayer.c   (working copy)
> @@ -2594,17 +2596,12 @@
> +
> +#ifdef CONFIG_PRIORITY
> +    set_priority();
> +#endif

.. you can use the following here:

  if (CONFIG_PRIORITY)
      set_priority();

Diego



More information about the MPlayer-dev-eng mailing list