From b800951399e9ea2d83dabac78e554cf196d4cfc5 Mon Sep 17 00:00:00 2001 From: Bram Verweij Date: Fri, 1 Jun 2007 09:05:56 +0200 Subject: Prioritise the musepack demuxer over mpgaudio, as sometimes the latter can misfire and report a good file as unplayable. --- ChangeLog | 2 ++ src/demuxers/group_audio.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1f439b880..a827947c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ xine-lib (1.1.7) (unreleased) * Use the integer versions of Speex decoding functions, this avoids an iteration over the decoded frames to transform them to integers, and also avoids an improper saturation. + * Prioritize the musepack demuxer over mpgaudio, as sometimes the latter can + misfire and report a good file as unplayable. xine-lib (1.1.6) * Split the DirectFB plugin into X11 and non-X versions. diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c index b8f0e1ed4..a498a3799 100644 --- a/src/demuxers/group_audio.c +++ b/src/demuxers/group_audio.c @@ -68,7 +68,7 @@ static const demuxer_info_t demux_info_mpgaudio = { }; static const demuxer_info_t demux_info_mpc = { - 0 /* priority */ + 1 /* priority */ }; static const demuxer_info_t demux_info_nsf = { -- cgit v1.2.3 From 40bb772fadfdad2d08c4b5c7c8c02d9fdc1963b5 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 1 Jun 2007 17:48:18 +0100 Subject: Port Simon Farnsworth's xv deinterlacing fix to xcbxv. --- src/video_out/video_out_xcbxv.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index 432d93416..68b6a934b 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -443,17 +443,17 @@ static void xv_deinterlace_frame (xv_driver_t *this) { else recent_bitmaps[i] = NULL; - deinterlace_yuv( this->deinterlace_frame.image+frame->width*frame->height, - recent_bitmaps, frame->width/2, frame->height/2, this->deinterlace_method ); + deinterlace_yuv( this->deinterlace_frame.image + this->deinterlace_frame.xv_width * frame->height, + recent_bitmaps, this->deinterlace_frame.xv_width/2, frame->height/2, this->deinterlace_method ); for( i = 0; i < VO_NUM_RECENT_FRAMES; i++ ) if( this->recent_frames[i] && this->recent_frames[i]->width == frame->width && this->recent_frames[i]->height == frame->height ) - recent_bitmaps[i] = this->recent_frames[i]->image + frame->width*frame->height*5/4; + recent_bitmaps[i] = this->recent_frames[i]->image + this->deinterlace_frame.xv_width*frame->height*5/4; else recent_bitmaps[i] = NULL; - deinterlace_yuv( this->deinterlace_frame.image+frame->width*frame->height*5/4, - recent_bitmaps, frame->width/2, frame->height/2, this->deinterlace_method ); + deinterlace_yuv( this->deinterlace_frame.image + this->deinterlace_frame.xv_width*frame->height*5/4, + recent_bitmaps, this->deinterlace_frame.xv_width/2, frame->height/2, this->deinterlace_method ); #else @@ -472,7 +472,7 @@ static void xv_deinterlace_frame (xv_driver_t *this) { recent_bitmaps[i] = NULL; deinterlace_yuv( this->deinterlace_frame.image, recent_bitmaps, - frame->width, frame->height, this->deinterlace_method ); + this->deinterlace_frame.xv_width, frame->height, this->deinterlace_method ); } else { /* -- cgit v1.2.3 From 3118927915161d5f32b3bb5dcd6c2b721b9fcb99 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 2 Jun 2007 00:16:48 +0100 Subject: Add a -doc package, allowing libxine1 and libxine2 to be installed together. --- debian/control | 17 ++++++++++++++++- debian/libxine1-doc.docs | 8 ++++++++ debian/libxine1-doc.manpages | 1 + debian/libxine1.install | 3 --- 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 debian/libxine1-doc.docs create mode 100644 debian/libxine1-doc.manpages diff --git a/debian/control b/debian/control index c01e82fa5..b3e499ba5 100644 --- a/debian/control +++ b/debian/control @@ -42,10 +42,25 @@ Description: the xine video player library, development packages The xine-ui and gxine packages each provide one for your convenience, so you can just start watching your VCDs ;-) +Package: libxine1-doc +Architecture: all +Section: libdevel +Provides: libxine-doc +Conflicts: libxine2-doc +Description: the xine video player library, development packages + This contains documentation for the xine library (libxine). + . + Libxine provides the complete infrastructure for a video/media player. It + supports MPEG 1/2 and some AVI and Quicktime videos out of the box, so you + can use it to play DVDs, (S)VCDs and most video files out there. It + supports network streams, subtitles and even MP3 or Ogg files. It's + extensible to your heart's content via plugins for audio and video output, + input media, demuxers (stream types), audio/video and subtitle codecs. + Package: libxine1 Architecture: any Depends: ${shlibs:Depends} -Recommends: ${shlibs:Recommends} +Recommends: ${shlibs:Recommends}, libxine1-doc | libxine-doc Suggests: ${shlibs:Suggests}, libartsc0 Description: the xine video/media player library, binary files This is the xine media player library (libxine). diff --git a/debian/libxine1-doc.docs b/debian/libxine1-doc.docs new file mode 100644 index 000000000..c75c374d7 --- /dev/null +++ b/debian/libxine1-doc.docs @@ -0,0 +1,8 @@ +debian/tmp/usr/share/doc/libxine1/faq/* +debian/tmp/usr/share/doc/libxine1/README_xxmc.html +debian/tmp/usr/share/doc/libxine1/README +debian/tmp/usr/share/doc/libxine1/faq.* +debian/tmp/usr/share/doc/libxine1/README.syncfb* +debian/tmp/usr/share/doc/libxine1/README.opengl* +debian/tmp/usr/share/doc/libxine1/README.dxr3* +debian/tmp/usr/share/doc/libxine1/README.dvb* diff --git a/debian/libxine1-doc.manpages b/debian/libxine1-doc.manpages new file mode 100644 index 000000000..23e59ea93 --- /dev/null +++ b/debian/libxine1-doc.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man5/xine.5 diff --git a/debian/libxine1.install b/debian/libxine1.install index 1efbabbea..b4037aa21 100644 --- a/debian/libxine1.install +++ b/debian/libxine1.install @@ -4,8 +4,5 @@ usr/lib/xine/plugins/*/*.so usr/lib/xine/plugins/*/vidix/*.so usr/share/locale usr/share/xine -usr/share/man/man5/xine.5 -usr/share/doc/libxine1/faq/* -usr/share/doc/libxine1/README* usr/share/doc/libxine1/hackersguide/* usr/share/bug/libxine1/presubj -- cgit v1.2.3 From 7d629a6104b9191d269a7e79ba96fc66b5f8d042 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 2 Jun 2007 14:54:21 +0100 Subject: Bump libtool revision number. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 389563fba..a80f12aab 100644 --- a/configure.ac +++ b/configure.ac @@ -50,7 +50,7 @@ dnl * in Linux, the library will be named dnl libname.so.(XINE_LT_CURRENT - XINE_LT_AGE).XINE_LT_AGE.XINE_LT_REVISION XINE_LT_CURRENT=18 -XINE_LT_REVISION=0 +XINE_LT_REVISION=1 XINE_LT_AGE=17 dnl for a release tarball do "rm .cvsversion" before "make dist" -- cgit v1.2.3 From 29a4bed3de97bf33fe1dd786c0b1f0638c152684 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 2 Jun 2007 15:25:50 +0100 Subject: Conflict with libxine2-dev. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index b3e499ba5..fc8098175 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Package: libxine-dev Architecture: any Section: libdevel Depends: libxine1 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev -Conflicts: xine-ui (<< 0.9.10) +Conflicts: xine-ui (<< 0.9.10), libxine2-dev Description: the xine video player library, development packages This contains development files (headers, documentation and the like) for the xine library (libxine). -- cgit v1.2.3