diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | debian/control | 20 | ||||
| -rw-r--r-- | debian/libxine2-doc.docs | 8 | ||||
| -rw-r--r-- | debian/libxine2-doc.manpages | 1 | ||||
| -rw-r--r-- | debian/libxine2.install | 3 | ||||
| -rw-r--r-- | src/demuxers/group_audio.c | 2 |
6 files changed, 30 insertions, 6 deletions
@@ -49,6 +49,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/debian/control b/debian/control index fc7bf047c..a8f4cccb3 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Package: libxine-dev Architecture: any Section: libdevel Depends: libxine2 (= ${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). @@ -42,10 +42,26 @@ 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: libxine2-doc +Architecture: all +Section: libdevel +Provides: libxine-doc +Conflicts: libxine1-doc +Replaces: libxine1-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: libxine2 Architecture: any Depends: ${shlibs:Depends} -Recommends: ${shlibs:Recommends} +Recommends: ${shlibs:Recommends}, libxine2-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/libxine2-doc.docs b/debian/libxine2-doc.docs new file mode 100644 index 000000000..3df629bbf --- /dev/null +++ b/debian/libxine2-doc.docs @@ -0,0 +1,8 @@ +debian/tmp/usr/share/doc/libxine2/faq/* +debian/tmp/usr/share/doc/libxine2/README_xxmc.html +debian/tmp/usr/share/doc/libxine2/README +debian/tmp/usr/share/doc/libxine2/faq.* +debian/tmp/usr/share/doc/libxine2/README.syncfb* +debian/tmp/usr/share/doc/libxine2/README.opengl* +debian/tmp/usr/share/doc/libxine2/README.dxr3* +debian/tmp/usr/share/doc/libxine2/README.dvb* diff --git a/debian/libxine2-doc.manpages b/debian/libxine2-doc.manpages new file mode 100644 index 000000000..23e59ea93 --- /dev/null +++ b/debian/libxine2-doc.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man5/xine.5 diff --git a/debian/libxine2.install b/debian/libxine2.install index 42f7937c2..8c97ee196 100644 --- a/debian/libxine2.install +++ b/debian/libxine2.install @@ -4,8 +4,5 @@ usr/lib/xine/plugins/*/*.so usr/lib/xine/plugins/*/vidix/*.so usr/share/locale usr/share/xine-lib -usr/share/man/man5/xine.5 -usr/share/doc/libxine2/faq/* -usr/share/doc/libxine2/README* usr/share/doc/libxine2/hackersguide/* usr/share/bug/libxine2/presubj diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c index 8c1efdde6..449c2ad12 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_realaudio = { |