summaryrefslogtreecommitdiff
path: root/packages/mplayer/files/w100-mplayer.patch
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2006-12-06 09:35:40 +0000
committerGraeme Gregory <dp@xora.org.uk>2006-12-06 09:35:40 +0000
commit71b645d6d468556b98ea362591e317289e823dac (patch)
tree5af6a0614bda2555467251004dfb1c4990bf0403 /packages/mplayer/files/w100-mplayer.patch
parentc484a94ef3b9bc3e42f06b5157086c4309591e69 (diff)
mplayer_0.0+1.0rc1.bb : add latest version of mplayer, fixing versioning
to meet OE policy. A couple of patches have been rediffed and two Makefile patches dropped as what they did is now in the Makefiles in question.
Diffstat (limited to 'packages/mplayer/files/w100-mplayer.patch')
-rw-r--r--packages/mplayer/files/w100-mplayer.patch15
1 files changed, 8 insertions, 7 deletions
diff --git a/packages/mplayer/files/w100-mplayer.patch b/packages/mplayer/files/w100-mplayer.patch
index 4bed6326d1..8ce37d014c 100644
--- a/packages/mplayer/files/w100-mplayer.patch
+++ b/packages/mplayer/files/w100-mplayer.patch
@@ -1,6 +1,8 @@
---- mplayer_20060519/mplayer.c.orig 2006-05-30 12:31:01.000000000 +0100
-+++ mplayer_20060519/mplayer.c 2006-05-30 12:33:41.000000000 +0100
-@@ -628,6 +628,18 @@
+Index: MPlayer-1.0rc1/mplayer.c
+===================================================================
+--- MPlayer-1.0rc1.orig/mplayer.c
++++ MPlayer-1.0rc1/mplayer.c
+@@ -807,6 +807,17 @@ static void exit_sighandler(int x){
exit_player(NULL);
}
@@ -15,11 +17,10 @@
+ }
+}
+
-+
- //extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height);
-
extern void mp_input_register_options(m_config_t* cfg);
-@@ -2732,6 +2744,9 @@
+
+ #include "mixer.h"
+@@ -3216,6 +3227,9 @@ current_module = NULL;
#endif
#endif