summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--misc/Makefile.am4
-rw-r--r--misc/xine_logo.mpv (renamed from misc/xine_logo.mpg)bin27309 -> 27309 bytes
-rw-r--r--src/xine-engine/Makefile.am2
4 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f6602f5ae..2ea68e7b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ xine-lib (0.9.12) unstable; urgency=low
* fixed bug in libsputext that caused subtitle flashing
* update win32 codec loading code
* use directshow filter to decode msmpeg4 v1/v2
+ * fixed logo file name extension
+ * fixed german i18n files
+
+ -- Guenter Bartsch <guenter@users.sourceforge.net>
xine-lib (0.9.11) unstable; urgency=low
diff --git a/misc/Makefile.am b/misc/Makefile.am
index a9d43858f..408d130d1 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -2,10 +2,10 @@ SUBDIRS = fonts
EXTRA_DIST = autogen.sh SlackBuild.in SlackBuild build_rpms.sh \
xine-lib.spec.in xine-lib.spec xine-fontconv.c \
- xine_logo.mpg vga.xinefont.gz
+ xine_logo.mpv vga.xinefont.gz
datadir = $(XINE_SKINDIR)
-data_DATA = xine_logo.png xine_logo.mpg
+data_DATA = xine_logo.png xine_logo.mpv
bin_SCRIPTS = xine-config
diff --git a/misc/xine_logo.mpg b/misc/xine_logo.mpv
index b1cb59414..b1cb59414 100644
--- a/misc/xine_logo.mpg
+++ b/misc/xine_logo.mpv
Binary files differ
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 5787ab7bd..bdce42f01 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -2,7 +2,7 @@
## Process this file with automake to produce Makefile.in
##
-CFLAGS = @CFLAGS@ $(THREAD_CFLAGS) $(X_CFLAGS) -DXINE_LOGO_FILE=\"file://@XINE_SKINPATH@/xine_logo.mpg\"
+CFLAGS = @CFLAGS@ $(THREAD_CFLAGS) $(X_CFLAGS) -DXINE_LOGO_FILE=\"file://@XINE_SKINPATH@/xine_logo.mpv\"
lib_LTLIBRARIES = libxine.la