search

chenyunecjtu / coreavc-for-linux

Automatically exported from code.google.com/p/coreavc-for-linux
GNU General Public License v2.0
0 stars 1 forks source link

Mplayer patch fails on latest svn #44

Closed GoogleCodeExporter closed 8 years ago

GoogleCodeExporter commented 8 years ago 
What steps will reproduce the problem?
1. svn checkout http://coreavc-for-linux.googlecode.com/svn/trunk/
coreavc-for-linux 
2. svn checkout svn://svn.mplayerhq.hu/mplayer/trunk mplayer
3. ./configure
4. patch -p0 < ../coreavc-for-linux/mplayer/dshowserver.patch

What is the expected output? What do you see instead?
patching file libmpcodecs/vd.c
Hunk #2 FAILED at 62.
1 out of 2 hunks FAILED -- saving rejects to file libmpcodecs/vd.c.rej
patching file Makefile
Hunk #1 succeeded at 20 with fuzz 1 (offset 15 lines).
Hunk #2 succeeded at 224 (offset 14 lines).
patching file libmpcodecs/vd_dshowserver.c

What version of the product are you using? On what operating system?
CoreAVC 1.7

Please provide any additional information below.
dshowserver have been compiled and accordingly to test works fine. Will
attache the rejects file/

Original issue reported on code.google.com by jevgenij...@gmail.com on 2 Aug 2008 at 7:17

Attachments:

GoogleCodeExporter commented 8 years ago 
changing 
#ifdef HAVE_OGGTHEORA  to  #ifdef CONFIG_OGGTHEORA

and

#ifdef USE_WIN32DLL  to  #ifdef CONFIG_WIN32DLL

in dshowserver.patch seems to make the patch apply without rejects, with a few
warnings still though.

Original comment by soere...@gmail.com on 5 Aug 2008 at 8:36

GoogleCodeExporter commented 8 years ago 
resolved in r69

Original comment by alannis...@gmail.com on 8 Oct 2008 at 9:44