debian/0000755000000000000000000000000013350206210007156 5ustar debian/mplayer-doc.doc-base.de0000644000000000000000000000062012304130614013360 0ustar Document: mplayer-de Title: MPlayer documentation (German) Author: The MPlayer team Abstract: This documentation describes the use of MPlayer. (German) MPlayer is a movie player for GNU/Linux that supports a wide range of audio and video formats, and output drivers. Section: Sound Format: HTML Index: /usr/share/doc/mplayer-doc/HTML/de/index.html Files: /usr/share/doc/mplayer-doc/HTML/de/*.html debian/README.source0000644000000000000000000000173112304130614011341 0ustar The source tarball for daily snapshots is now downloaded from launchpad: https://launchpad.net/~motumedia/+archive/mplayer-daily/+packages The tarballs are generated from SVN via a cronjob, and contain a copy of Libav instead of FFmpeg. When updating to new upstream version, make sure that you rename the tarball to mach the debian versioning scheme. -- Reinhard Tartler , Thu, 12 Jan 2012 22:17:07 +0100 The sources of this mplayer package have some parts removed! * In particular, the internal libdvdcss library was deleted, so the mplayer package provided by Debian is unable to play encrypted DVDs. If you want to play encrypted DVDs (i.e. almost all available Video-DVDs), please follow the instructions in /usr/share/doc/libdvdread3/README.Debian on how to obtain the necessary libdvdcss2 package. A. Mennucc with adaptions by Reinhard Tartler and Fabian Greffrath -- Reinhard Tartler , Sun, 13 Feb 2011 09:55:32 +0100 debian/changelog0000644000000000000000000015654213350206210011045 0ustar mplayer (2:1.1+dfsg1-0ubuntu3.1) trusty-security; urgency=medium * SECURITY UPDATE: Integer overflow in demuxer for GIFs - debian/patches/CVE-2016-4352.patch: Validate image size in demux_gif - CVE-2016-4352 -- Mike Salvatore Tue, 18 Sep 2018 06:20:41 -0400 mplayer (2:1.1+dfsg1-0ubuntu3) trusty; urgency=medium * No-change rebuild for x264 soname bump. -- Matthias Klose Mon, 24 Mar 2014 05:56:02 +0000 mplayer (2:1.1+dfsg1-0ubuntu2) trusty; urgency=medium * Minimal port to arm64. I haven't done any assembler optimisations so this may not be very fast, but it's at least good enough to satisfy dependencies of other packages. -- Colin Watson Fri, 21 Mar 2014 11:37:33 +0000 mplayer (2:1.1+dfsg1-0ubuntu1) trusty; urgency=medium * Upload debian/master.experimental 92e6d4353a3a95cdf2bf1d24d9d6bfb331ad672f to ubuntu Trusty. * Add get-orig-source target. * Merge remaining ubuntu changes: - drop ffmpeg-dbg recommends -- Dimitri John Ledkov Fri, 28 Feb 2014 15:56:55 +0000 mplayer (2:1.1+dfsg1-1) UNRELEASED; urgency=low [ upstream ] * New release. + Fixes "mplayer freezes while playing back a theora video file". Closes: #590441. + Fixes playback with theora. Closes: #680595. [ Reinhard Tartler ] * Update and refresh patches. * Improve package descriptions. Closes: #641675. Thanks to Paul Stewart . [ Jonas Smedegaard ] * Tighten build-dependencies on libpostproc-dev and libswscale-dev. -- Reinhard Tartler Fri, 18 Jan 2013 23:48:09 +0100 mplayer (2:1.0~rc4.dfsg1+svn34540-1) unstable; urgency=low * New upstream snapshot * upload to unstable -- Reinhard Tartler Thu, 12 Jan 2012 22:23:28 +0100 mplayer (2:1.0~rc4.dfsg1+svn34492-3) experimental; urgency=low * Build against external libmpeg2 * drop 51_FTBFS_arm.patch again -- Reinhard Tartler Mon, 09 Jan 2012 22:23:38 +0100 mplayer (2:1.0~rc4.dfsg1+svn34492-2) experimental; urgency=low * no longer build depend on libcdparanoia-dev on the Hurd * Fix FTBFS on the hurd. Thanks to Samuel Thibault (Closes: #654974) * Fix FTBFS on arm -- Reinhard Tartler Sun, 08 Jan 2012 14:25:45 +0100 mplayer (2:1.0~rc4.dfsg1+svn34492-1) experimental; urgency=low [ Rico Tzschichholz ] * New upstream snapshot, Closes: #650339, #643621, #481807 * Imported Upstream version 1.0~rc4+svn34492 * Bump standards version * Bump dependency on libav >= 4:0.8~, Closes: #653887 * Fix build-indep [ Reinhard Tartler ] * Build mplayer-gui again, Closes: #568514 * Drop debian/all-lang-config-mak.sh, no longer needed * include .dfsg1 in version number * remove get-orig-source target * no longer prune compiler flags from the environment * No longer advertise nor build 3fdx, mga and dxr3 backends, Closes: #496106, #442181, #533546 * beautify mplayer version identification string -- Reinhard Tartler Fri, 06 Jan 2012 16:26:01 +0100 mplayer (2:1.0~rc4.dfsg1+svn33713-5) unstable; urgency=low * Brown paperbag upload. * Next try to fix build failure on sparce after recent binutils change. -- Reinhard Tartler Sat, 29 Oct 2011 12:43:29 +0200 mplayer (2:1.0~rc4.dfsg1+svn33713-4) unstable; urgency=low * Brown paperbag upload. * Really fix build failure on sparc after recent binutils change. -- Reinhard Tartler Sat, 29 Oct 2011 11:35:25 +0200 mplayer (2:1.0~rc4.dfsg1+svn33713-3) unstable; urgency=high [ Alessio Treglia ] * Properly set Replaces/Conflicts on mplayer2{,-dbg} to avoid file overwrite errors. * Adjust versioning of mplayer listed in the mplayer-dbg's Depends field. [ Reinhard Tartler ] * Fix build failure on sparc after recent binutils change. * Urgency medium bumped because of RC-level bugfix and speeding up x264 transition. -- Reinhard Tartler Sat, 29 Oct 2011 10:29:57 +0200 mplayer (2:1.0~rc4.dfsg1+svn33713-2) unstable; urgency=low [ Andres Mejia ] * Update to my @debian.org email. [ Reinhard Tartler ] * Upload to unstable * Enable joystick support on Linux only, Closes: #638408 * Rebuild fixes toolchain issue on arm, Closes: #637077 -- Reinhard Tartler Fri, 02 Sep 2011 09:22:11 +0200 mplayer (2:1.0~rc4.dfsg1+svn33713-1) experimental; urgency=low * New upstream snapshot - update 23mplayer-debug-printf.patch - fixes miscompilation with gcc 4.6, Closes: #623304 - improved internal mkv demuxer, Closes: #595452 - Fixed segfault due to missing sanitation on playlist files, Closes: #591525 - Fixed byteorder on 16-bit displays, Closes: #594093 - tighten build depends on libav - --enable-largefile switch has been dropped - add build dependency on yasm * Fix build dependency on libjpeg-dev, Closes: #634277 * rewrite debian/copyright in DEP5 format * fix clean target * don't remove snapshot_version file * enable XVID, MP3 and X264 encoders * simply architecture specific dependencies, Closes: #634773 * make buildlogs verbose * unbreak building mplayer-doc package * don't fail debian package build if not all shlibdeps information could be retrieved * update configure flags for static libav* libraries * fix spelling in mplayer-dbg description, Closes: #617826 * enable blueray support, Closes: #577761 [ Robert Millan ] * Select oss as default audio output module on kFreeBSD, Closes: #598431 -- Reinhard Tartler Sat, 25 Jun 2011 09:05:54 +0200 mplayer (2:1.0~rc4+svn33713-1) experimental; urgency=low * New upstream snapshot -- Reinhard Tartler Sat, 25 Jun 2011 09:05:54 +0200 mplayer (2:1.0~rc4.dfsg1-2) unstable; urgency=low [ Fabian Greffrath ] * Update documentation with regard to our modifications to the upstream tarball. [ Reinhard Tartler ] * really no longer build mplayer-gui, Closes: #612473 * simplify/remove instruction to get upstream sources * normalize debian/{control,copyright,mplayer.install} with wrap-and-sort * bump standards version -- Reinhard Tartler Thu, 03 Mar 2011 18:04:07 +0100 mplayer (2:1.0~rc4.dfsg1-1) unstable; urgency=low * upload to unstable -- Reinhard Tartler Sun, 06 Feb 2011 17:06:33 +0100 mplayer (2:1.0~rc4~try2.dfsg1-1) experimental; urgency=low [ steph ] * enable joystick at compilation but leave it disable in config (Closes: #592082, LP: #617986) [ Reinhard Tartler ] * new upstream snapshot, remove patches that are applied upstream * minor clarifications in debian/copyright -- Reinhard Tartler Sun, 23 Jan 2011 21:59:46 +0100 mplayer (2:1.0~rc4~try1.dsfg1-1) experimental; urgency=low * enable the mencoder package * sort build depends alphabetically * enable dvdnav support, Closes: #582508, #488226, LP: #611749 * prepare new upload * no longer build mplayer-gui, it doesn't build anymore with shared swscale -- Reinhard Tartler Mon, 02 Aug 2010 16:30:06 -0400 mplayer (2:1.0~rc4~try1-1) experimental; urgency=low * New Upstream Version, LP: #539315 * Build (against) again the System FFmpeg * tighten dependency on FFmpeg 0.6 * remove patches merged upstream * remove 22disable-xscreensaver.patch * refresh patches -- Reinhard Tartler Wed, 28 Jul 2010 21:04:54 -0400 mplayer (2:1.0~rc3++final.dfsg1-2) unstable; urgency=low * prepare next upload -- Reinhard Tartler Sat, 07 Aug 2010 10:20:58 -0400 mplayer (2:1.0~rc3++final.dfsg1-1) unstable; urgency=low * upload to unstable * enable mencoder and mplayer-gui package * build again against the system FFmpeg 0.5 -- Reinhard Tartler Sat, 31 Jul 2010 23:44:52 -0400 mplayer (2:1.0~rc3++final-1~exp1) experimental; urgency=low * build mplayer against internal ffmpeg to workaround interoperability problems with FFmpeg 0.6 -- Reinhard Tartler Thu, 03 Jun 2010 18:25:34 +0200 mplayer (2:1.0~rc3++final-0ubuntu2) maverick; urgency=low * remove old parallel building mechanism, fixes FTBFS -- Reinhard Tartler Thu, 03 Jun 2010 14:59:41 +0200 mplayer (2:1.0~rc3++final-0ubuntu1) maverick; urgency=low * New upstream version * compile against internal ffmpeg for now, LP: #587203, #588097 * recompile for directfb transtion, LP: #587163 * remove patches that were merged upstream * avoid removing DOCS/html directory. it is included in release tarball * convert to source Format: 3.0 (quilt) * refreshed patches * remove files that are included in upstream tarball * rework debian/rules file - support parallel building - merge build rules for mplayer and mencoder package - remove unreferenced COMMON_CONFIGURE_FLAGS macro - rename DEB_BUILD_CONFIGURE -> CONFIGURE_FLAGS - don't build documentation - release tarballs have them prebuilt - build HTML documentation only if not already avaiable in the build tree - remove remaining references to debian/strip.sh from debian/rules * remove copied vdpau headers -- Reinhard Tartler Tue, 01 Jun 2010 22:59:06 +0200 mplayer (2:1.0~rc3+svn20100502-4) unstable; urgency=low * copy in mencoder.c from upstream * enable mplayer-gui (Closes: #579925) and mencoder packages. (Closes: #396954, #400940, #580168) -- Reinhard Tartler Wed, 26 May 2010 08:57:28 +0200 mplayer (2:1.0~rc3+svn20100502-3) medium; urgency=low * Fix rtsp vulnerability. Patch applied by DSA. Closes: #581245 * Fix another integer overflow, Closes: #524805 * prepare new upload * sync libao2/ao_pulse.c with svn r30062, Closes: #558196, #580113 * make configure use pkg-config for fribidi checks. Closes: #582784, LP: #556200 * document 23mplayer-debug-printf.patch * avoid mentioning of GTK frontend in mplayer description * improve package descriptions of mplayer-doc and mplayer-dbg * medium urgency because of fixed security issue * fix SVN_VERION regex in debian rules to unbreak get-orig-source target. Closes: #582369 * forcefully disable arts support. Closes: #581225 -- Reinhard Tartler Tue, 25 May 2010 20:18:08 +0200 mplayer (2:1.0~rc3+svn20100502-2) unstable; urgency=low * Remove mencoder from Depends in mplayer-dbg package. -- Andres Mejia Mon, 03 May 2010 20:19:41 -0400 mplayer (2:1.0~rc3+svn20100502-1) unstable; urgency=low * new upstream snapshot from rc3 branch. * remove patches applied upstream: - 24_enable_fontconfig_by_default.diff - 30_add_gmplayer_man_rules.diff - 40_improve_desktop_file.patch - 41_fix_forcedsubsonly.patch - 50_fix_crashes_with_invalid_SDPs.patch - 50_fix_initial_volume_setting_pulse_output.patch - 61-malloc-bsd.patch - 62-disable-vidix-on-kfreebsd-amd64.patch - 63-sys-kd-include.patch -- Reinhard Tartler Sat, 01 May 2010 21:31:58 +0200 mplayer (2:1.0~rc3+svn20090426-2) unstable; urgency=low * don't install apport hook * gross hack to avoid building mplayer-nogui and mplayer-gui packages * add md5sum to remove to avoid spurious conffile prompt, Closes: #568272 * Make mplayer build on kFreeBSD (backports from upstream), Closes: #578622 - Revert obscure hack that disables the malloc.h check on certain BSD platforms. - disable vidix on kFreeBSD-amd64 - rename 'struct keypad' -> 'struct m_keypad' to avoid FTBFS on kFreeBSD/amd64 -- Reinhard Tartler Sat, 24 Apr 2010 11:34:51 +0200 mplayer (2:1.0~rc3+svn20090426-1ubuntu16) lucid; urgency=low * move config file and apport hook 'mplayer-nogui'->'mplayer' LP: #540491, #549613 * improve mplayer version output * no longer build depend on libfaac, see LP #374900 for details * attach alsa_information in the apport hook -- Reinhard Tartler Wed, 31 Mar 2010 19:54:53 +0200 mplayer (2:1.0~rc3+svn20090426-1ubuntu15) lucid; urgency=low * backport newer libx264 wrapper, LP: #539555 -- Reinhard Tartler Wed, 17 Mar 2010 13:39:44 +0100 mplayer (2:1.0~rc3+svn20090426-1ubuntu14) lucid; urgency=low * cleanup --configure flags * drop VDPAU build hacks, Closes: #566868, LP: #530481, #532007 * enable musepack support * enable libaa support, LP: #502767, #455535 * enable enca support, LP: #115519 * remove DEB_BUILD_CONFIGURE override hack * fix weird permission bits for mplayer.desktop and mplayer.xpm * reorganize binary packages to no longer install the gui version by default * refactor debian/rules to avoid sub makes * add patch to allow compilation with newer x264 * use mp_msg instead of printf in debug help message * bump standards version * as no longer used, remove dependencies on debconf * Fix possible crashes with invalid SDPs, LP: #519579 * add missing replaces * install manpages in the 'mplayer' package. and only there -- Reinhard Tartler Thu, 11 Mar 2010 12:45:55 +0100 mplayer (2:1.0~rc3+svn20090426-1ubuntu13) lucid; urgency=low * rebuild for ffmpeg versioned symbols -- Reinhard Tartler Tue, 19 Jan 2010 21:31:51 +0100 mplayer (2:1.0~rc3+svn20090426-1ubuntu12) lucid; urgency=low * debian/patches/41_fix_forcedsubsonly.patch: fix the forcedsubsonly option. This fixes a problem with ogmrip always encoding with subtitles. (LP: #458129). * debian/control: Change build-dep libxvidcore4-dev to libxvidcore-dev. (LP: #486169) -- Marc Deslauriers Mon, 23 Nov 2009 20:11:33 -0500 mplayer (2:1.0~rc3+svn20090426-1ubuntu11) lucid; urgency=low * Add 50_fix_initial_volume_setting_pulse_output.patch to resolve the stream volume being set to max upon each mplayer invocation (LP: #482408) -- Daniel T Chen Wed, 18 Nov 2009 19:42:09 -0500 mplayer (2:1.0~rc3+svn20090426-1ubuntu10) karmic; urgency=low * make sure that patches are applied for non-i386 builds as well. Fixes: LP: #390398, #448603, #448595, #441566, #440346 -- Reinhard Tartler Thu, 15 Oct 2009 17:55:21 +0200 mplayer (2:1.0~rc3+svn20090426-1ubuntu9) karmic; urgency=low [ Julien Lavergne ] * Renable xvid support by removing --disable-xvid in debian/rules. [ Reinhard Tartler ] * Also enable mp3lame support (at least for now) LP: #386449 * don't override the mplayer built-in defaults for the vo module LP: #446040 * verified that mennuc's screensaver patch is enabled and works in the default configuration. LP: #439787 -- Reinhard Tartler Thu, 08 Oct 2009 09:23:29 +0200 mplayer (2:1.0~rc3+svn20090426-1ubuntu8) karmic; urgency=low * build depend on nvidia-185-libvdpau-dev only on i386 and amd64 * add ubuntu specific configuration file. LP: #276957, #440343 -- Reinhard Tartler Sat, 03 Oct 2009 10:45:23 +0200 mplayer (2:1.0~rc3+svn20090426-1ubuntu7) karmic; urgency=low * remove 41_use_fontconfig_by_default.patch, doesn't apply * enable VDPAU on i386 and amd64 (LP: #437039) -- Reinhard Tartler Mon, 28 Sep 2009 19:32:29 +0000 mplayer (2:1.0~rc3+svn20090426-1ubuntu6) karmic; urgency=low [ Andres Mejia ] * Enable VDPAU support by including vdpau headers in deb packaging. [ Reinhard Tartler ] * sort build dependencies alphabetically * avoid using tabs - prefer space instead * reenable 22disable-xscreensaver.patch. The patch does work, but you need to have the mouse cursor INSIDE the window * don't build-depend on libmad, the internal mp3lib library is superiour for most cases these days, according to upstream. LP: #111025, #163382 * add clarifications to the libgsm license. * install the TOOLS/midentify.sh script LP: #333828 -- Reinhard Tartler Thu, 24 Sep 2009 21:09:24 +0200 mplayer (2:1.0~rc3+svn20090426-1ubuntu5) karmic; urgency=low * No-change rebuild to pick up new ffmpeg shlibs file. -- Stefan Potyra Fri, 28 Aug 2009 21:04:38 +0200 mplayer (2:1.0~rc3+svn20090426-1ubuntu4) karmic; urgency=low * remove 22disable-xscreensaver.patch. Patch is not working properly anyways and actually potentially dangerous because it is faking input activity. * enable fontconfig by default. (Closes: #573257) -- Reinhard Tartler Thu, 18 Jun 2009 16:09:33 +0200 mplayer (2:1.0~rc3+svn20090426-1ubuntu3) karmic; urgency=low [ Reinhard Tartler ] * add additional build dependencies that are available in ubuntu/multiverse LP: #386449 * prefer auto-detection and lavc variants of many codecs in debian/rules * install .desktop and .xpm file in the mplayer package [ Siegfried Gevatter ] * improve desktop file to conform (more) to the freedesktop file specification LP: #386505 -- Reinhard Tartler Mon, 15 Jun 2009 23:24:25 +0200 mplayer (2:1.0~rc3+svn20090426-1ubuntu2) karmic; urgency=low * Bump epoch in debian/control as well, so that the Replaces field has any effect in ubuntu -- Reinhard Tartler Mon, 08 Jun 2009 07:51:12 +0200 mplayer (2:1.0~rc3+svn20090426-1ubuntu1) karmic; urgency=low * Switch to debian packaging for the mplayer package * New upstream release, LP: #336697, #260918, #246675, #243453, #74282 * Fixes security issues: CVE-2008-5616, LP: #308939 * many flv fixes LP: #73271, #347021 * Build and install mencoder * Bump epoch -- Reinhard Tartler Sat, 06 Jun 2009 23:01:52 +0200 mplayer (1.0~rc3+svn20090426-1) unstable; urgency=low [ fabrice ] * Introduce the mplayer-nogui package, that does not depend on GTK+ [ Reinhard Tartler ] * new upstream svn version based on the 1.0rc3 branch * various cleanups and refactoring in debian/rules * no longer remove mencoder.c: It does hardly contain any "dangerous" or patented code. Instead: * strip libavcodec similar to how its done in the ffmpeg package. This brings the patent policy of the mplayer and ffmpeg package in debian finally in sync. c.f. the comments and the "discussion" in #522373. * install upstream's version of binary_codecs.sh -- Reinhard Tartler Thu, 04 Jun 2009 10:35:52 +0200 mplayer (1.0~rc3+svn20090405-1) unstable; urgency=low * New upstream version. Track the 1.0rc3 release branch for now. * remove 50_r28803_segfault_print_int.patch, merged upstream. * no longer remove the TOOLS subdirectory from the upstream source. * make get-orig-source rule actually work. * disable musepack support. Closes: #476384 * completely delegate handling of /etc/mplayer/mplayer.conf to dpkg. This change removes also all debconf templates and reduces package complexity. * move .gbp.conf to debian/gbp.conf * cleanups in debian/rules: prefer external debhelper helper files * enhance upstream Makefile to install gmplayer manpages - implement as quilt patch, submitted upstream - debian/rules: make use of the added rules * use dh_prep instead of dh_clean -k * bump Standards-Version to 3.8.1 -- Reinhard Tartler Sun, 05 Apr 2009 11:37:37 +0200 mplayer (1.0~rc2+svn20090303-7) unstable; urgency=low * various cleanups in debian/rules. * as a side effect, DEB_BUILD_OPTIONS set to noopt no longer works. It really needs to be implemented in ./configure instead of weird hackery in debian/rules. patches welcome. * run 'make distclean' only of config.mak exists. * remove debian/control.mplayer* variants. * don't --enable-debug on mipsen. This hopfully fixes the FTBFS on mipsen. -- Reinhard Tartler Thu, 02 Apr 2009 18:48:07 +0200 mplayer (1.0~rc2+svn20090303-6) unstable; urgency=low [ A Mennucc1 ] * use ./configure flags to dynamically link FFmpeg, delete patch 30link-system-ffmpeg.patch [ Reinhard Tartler ] * cleanup debian/rules: use --enable-debug on all architectures but mips. in order to fix a FTBFS. This results in making the -dbg package on mips useless. If you are interested in having a usable mplayer-dbg package on mips, please try enabling that switch in debian/rules and send us your buildlog! * run 'make distclean' only of config.mak exists * cleanup debian/rules: remove unnecessary clean statements -- Reinhard Tartler Sat, 28 Mar 2009 07:24:07 +0100 mplayer (1.0~rc2+svn20090303-5) unstable; urgency=low * debian/control : move docbook-xml,docbook-xsl,xsltproc from Build-Depends-Indep to Build-Depends, since they are needed to run configure -- A Mennucc1 Mon, 23 Mar 2009 10:05:45 +0100 mplayer (1.0~rc2+svn20090303-4) unstable; urgency=low * try another fix for bug 520113 * disable specific patch for powerpc, that was reducing optimization to -O to avoid gcc bug 475153 -- A Mennucc1 Sun, 22 Mar 2009 10:11:36 +0100 mplayer (1.0~rc2+svn20090303-3) unstable; urgency=low * try a fix for bug 520113 -- A Mennucc1 Fri, 20 Mar 2009 18:23:35 +0100 mplayer (1.0~rc2+svn20090303-2) unstable; urgency=low * always build documentation. Fixes FTBFS. -- Reinhard Tartler Fri, 13 Mar 2009 09:34:27 +0100 mplayer (1.0~rc2+svn20090303-1) unstable; urgency=low * new upstream snapshot (Closes: #517774) * this version has dvdnav:// support (Closes: #430211) * rebuild against new ffmpeg in unstable, (Closes: #518670, #516933, #492229, #505048, #512892, #496709) * converted package to use git Closes: #508483 * completly reworked the way the .orig.tar.gz is created, please see debian/README.upstream-upgrade and debian/get-orig-source.sh for details * large refactoring of debian/control and debian/rules * dropped many unnecessary versioned build dependencies * bumped debhelper compatibility level 4->7 * replace patch system from dpatch to quilt * dropped the following patches, merged upstream: - 10configure-alpha.dpatch - 12configure-vidix-alpha.dpatch - 24mplayer.desktop.dpatch - 25kFreeBDS.dpatch - 25mplayer-desktop.dpatch - 30vorbis-block-alloc.dpatch - 40rtsp_demux.dpatch - 51xsai.dpatch - CVE-2008-0073--rtsp_fix.diff - CVE-2008-0629--stream_cddb.c.diff - CVE-2008-0630.diff - SA33136_demux_vqf.c.diff - demux.patch - demux_audio_fix_20080129.diff - demux_mov_fix_20080129.diff - oCERT-2008-013--realfix.diff - theora_length_fix_svn27354.diff - to-ffmpeg-free-0.svn20080206.diff * reworked the way the control file for the mplayer-non-dfsg package is handled: it now copied from debian/control.mplayer-non-dfsg. Add a debian/control target in debian rules. * do not run the actual rules of debian/rules in parallel, fixes FTBFS * implement the debconf review by Josselin Mouette and Christian Perrier. The last debconf question is mplayer/replace-existing-files (which can be dropped after ucf is deployed in the package) and mplayer/voutput, which needs more thought. (Closes: #445091) * verified that http://oumph.free.fr/tmp/29761.h264 no longer crashes mplayer (Closes: #497467) * add japanese debconf translation, thanks to Hideki Yamane. (Closes: #512874) * warn about libstdc++.so.5 when installing binary codecs in i386 as well (Closes: #497787) * add libpulse-dev to build dependencies to enable pulseaudio backend (Closes: #468470) * add libschroedinger-dev to build dependencies -- Reinhard Tartler Wed, 11 Mar 2009 22:23:25 +0100 mplayer (1.0~rc2-20) unstable; urgency=low * use external libfaad : external libfaad is newer, and does not crash on aac file in http://bugs.debian.org/407010 -- A Mennucc1 Thu, 18 Dec 2008 11:48:42 +0100 mplayer (1.0~rc2-19) unstable; urgency=high * SA33136: MPlayer TwinVQ Processing Buffer Overflow Vulnerability Thanks to T. Klein, G. Iuculano, R. Döffinger (Closes: #508803). -- A Mennucc1 Mon, 15 Dec 2008 21:05:07 +0100 mplayer (1.0~rc2-18) unstable; urgency=high * fix oCERT-2008-013 Mplayer real demuxer heap. Thanks to Felipe Andres Manzano, Andrea Barisani, Steffen Joeris, Reimar Döffinger. (Closes: #500683). * Clean lintian warnings: build-depend on libgif-dev instead of libungif4-dev build-depend on x11proto-core-dev instead of x-dev depends on debconf | debconf-2.0 * Up standard to 3.8.0.0 support DEB_BUILD_OPTIONS="parallel=n" -- A Mennucc1 Mon, 22 Sep 2008 11:01:26 +0200 mplayer (1.0~rc2-17) unstable; urgency=low * fix bashism in binary_codecs.sh script, thanks to Raphael Geissert (Closes: #489636). * use proper name 'mplayer.xpm' for the icon, thanks to Fernando Mitio Yamada (Closes: #483499). * fix: show correct length of theora video (from svn27354), thanks to Sam Morris and Reimar Döffinger (Closes: #464207). * [INTL:sv] Swedish strings for mplayer debconf, thanks to brother@bsnet.se (Closes: #491777). -- A Mennucc1 Sun, 27 Jul 2008 09:26:24 +0200 mplayer (1.0~rc2-16) unstable; urgency=high * fix FTBFS, build-depends against libdvdread-dev, thanks to Bastian Blank (Closes: #491366). * update lists of binary codecs and mirrors -- A Mennucc1 Sun, 20 Jul 2008 12:05:47 +0200 mplayer (1.0~rc2-15) unstable; urgency=low * build-depend on liblzo2-dev * Bug fix: "mplayer segfaults on opening any *.flv file", thanks A LOT to Ondrej Certik (Closes: #489291). * Bug fix: "mplayer: crashes on playing a standalone aac file", thanks to Michal Suchanek (Closes: #489419). * Bug fix: "mplayer: crashes with "MPlayer interrupted by signal 11 in module: demux_open" on FLV files", thanks to Paul Collins (Closes: #487830). * Bug fix: "mplayer: [INTL:it] debconf templates italian translation", thanks to Alessandro Vietta (Closes: #481418). -- A Mennucc1 Sun, 06 Jul 2008 17:57:29 +0200 mplayer (1.0~rc2-14) unstable; urgency=low * Links with ffmpeg-free provided libraries (Closes: #395252). * Uses libsvga1-dev in Build-Depends instead of svgalibg1-dev, thanks to Guillem Jover (Closes: #483460). * Build-depend on vstream-client-dev, thanks to Paul Hedderly (Closes: #487291). -- A Mennucc1 Mon, 23 Jun 2008 13:20:34 +0200 mplayer (1.0~rc2-12) unstable; urgency=low * Conflicts on gcc-4.3 <= 4.3.0-3 to avoid bug 475153 . * Sorry, 'DEB_BUILD_OPTIONS=noopt ./debian/rules build-arch' is again broken in i386 . It is simply too difficult to build mplayer on i386 w/o optimizing it a bit. For details, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=402950#44 and following. * For this reason, and to help solving the strange bug 478731 I have decided to build mplayer with 'configure --enable-debug' and to create a 'mplayer-dbg' package, to ship debugging symbols. -- A Mennucc1 Thu, 01 May 2008 20:40:42 +0200 mplayer (1.0~rc2-11) unstable; urgency=low * avoid FTBFS bug introduced by dpkg-buildpackage setting of "CFLAGS & al" in environment, thanks to Lucas Nussbaum (Closes: #475973). * set 'autodetect' to 'xv,x11' to avoid problems with xvmc and/or gmplayer, thanks to Walter B. Rasmann (Closes: #473686). thanks to Sam Morris (Closes: #475934). thanks to Victor Hahn (Closes: #458786). * fix bashism in /bin/sh maintainer script, thanks to Raphael Geissert (Closes: #472232). * renamed mplayer.xpm to mplayer in desktop file, thanks to giggz (Closes: #472833). * added debian/README.source * add libmpcdec to build-dependencies -- A Mennucc1 Thu, 01 May 2008 12:16:08 +0200 mplayer (1.0~rc2-10) unstable; urgency=high * fix: CVE-2008-0073 remote code execution via crafted rtsp stream, thanks to Nico Golde and Reimar Döffinger (Closes: #473056). * use ALSA by default, thanks to Sam Morris (Closes: #470617). -- A Mennucc1 Sat, 29 Mar 2008 09:40:09 +0100 mplayer (1.0~rc2-9) unstable; urgency=low * fix: gmplayer wrong driver setting "vo_driver= xmga", thanks to Siegfrid Brandstätter (Closes: #449041). * added dependency libaudio-dev, libfribidi-dev, libopenal-dev; this should make mplayer compiling less dependent on build environment * and moreover I think I enabled almost everything around, thanks to Fabian Greffrath (Closes: #419790). * add BiDi support, thanks to Khaled Hosny (Closes: #462611). * removed 'uploaders: Dariush Pietrzak ' thanks to Lucas Nussbaum (Closes: #460031). * fix missing newline from message displayed by postinst script, thanks to Serafeim Zanikolas (Closes: #468059). -- A Mennucc1 Fri, 21 Mar 2008 16:14:55 +0100 mplayer (1.0~rc2-8) unstable; urgency=low * fix SVN25823 for CVE-2008-0630, buffer overflow via crafted url , thanks Niko Golde (closes: #464532) * fix SVN25824 for CVE-2008-0629, buffer overflow via crafted cddb title thanks Niko Golde (closes: #464533) * fix for CVE-2008-0485 Array index error in libmpdemux/demux_mov.c a.k.a. CORE-2007-1218: MPlayer 1.0rc2 buffer overflow vulnerability thanks Stefan Fritsch * fix for CVE-2008-0486 Array index vulnerability in libmpdemux/demux_audio.c a.k.a. CORE-2008-0122: MPlayer arbitrary pointer dereference thanks Stefan Fritsch (closes: #464060) -- A Mennucc1 Fri, 8 Feb 2008 20:42:41 +0100 mplayer (1.0~rc2-7) unstable; urgency=low * fix segfault on GNU/kFreeBSD, by moving a patch from debian/patches/25kFreeBDS.dpatch directly to debian/rules itself, thanks to Petr Salinger (Closes: #457312). * really remove /etc/init.d/mplayer and /etc/rc... files (used < 1.0~rc2-1), thanks to Kumar Appaiah & piuparts (Closes: #454710). * Avoid 'echo -e' bashism in postinst (now uses /bin/echo ), thanks to Helmut Grohne (Closes: #451551). * delete config.h config.mak from diff.gz, thanks to Fabian Greffrath (Closes: #451381). * [INTL:sk] Slovak po-debconf translation, thanks to helix84@centrum.sk (Closes: #440717). * enable jack support, thanks to Free Ekanayaka (Closes: #440461). * Document 22disable-xscreensaver.dpatch * Bump standard to 3.7.3.0 : - menu for "/usr/bin/gmplayer" goes in section="Applications/Video" - added Homepage and Vcs fields -- A Mennucc1 Sat, 29 Dec 2007 13:08:22 +0000 mplayer (1.0~rc2-6) unstable; urgency=low * created debhelper debian/compat '5' * corrected mplayer.menu to section="Applications/Viewers" * fix: cant open a file with spaces in the name through nautilus, thanks to giggz (Closes: #449298) * fix: 2xsai filter generates side-by-side double-height images on amd64, thanks to Josh Triplett and Reimar Döffinger (Closes: #450999) * clean up of 10configure-alpha.dpatch and 12configure-vidix-alpha.dpatch * Debconf templates and debian/control reviewed by the debian-l10n-english team as part of the Smith review project. Thanks to Christian Perrier. Closes: #447111, #448247, #412394, #414510, #448247 [Debconf translation updates] * Belarusian. Thanks Andrei Darashenka. Closes: #447115, #447305 * Galician. Thanks Jacobo Tarrio. Closes: #447300 * French Thanks Yves Rütschlé. Closes: #448844 * Finnish. Thanks Esko Arajärvi. Closes: #447349 * Spanish; Castilian. Thanks Javier Fernández-Sanguino Peña. Closes: #447416 * Czech. Thanks Miroslav Kure. Closes: #447439 * Portuguese. Thanks "traduz" Carlos Lisboa. Closes: #447800 * Vietnamese. Thanks Clytie Siddall. Closes: #447873 * Romanian. Thanks Eddy Petrișor. Closes: #447922 * Dutch; Flemish. Thanks "cobaco". Closes: #448120 * Italian. Thanks Luca Monducci. Closes: #448237 * German. Thanks Helge Kreutzmann. Closes: #448246 * Malayalam. Thanks Santhosh Thottingal. Closes: #448468 * Russian. Thanks Sergey Alyoshin. Closes: #449000 -- A Mennucc1 Wed, 14 Nov 2007 15:49:04 +0100 mplayer (1.0~rc2-5) unstable; urgency=low * patch to play rtsp stream (hack to skip short packets) thanks to Stefan Strasser, Reimar Döffinger (Closes: #410424). * the bug "mplayer segfaults on ogg video" was actually a libtheora bug, fixed in 1.0~beta1-1 or above: added dependency. Thanks to Pierre Habouzit, Reimar Döffinger (Closes: #408071). * Fix FTBFS on GNU/kFreeBSD, thanks to Petr Salinger (Closes: #448791). -- A Mennucc1 Sun, 04 Nov 2007 12:56:38 +0000 mplayer (1.0~rc2-4) unstable; urgency=low * fix: _vorbis_block_alloc() implicitly converted to pointer, thanks to dann frazier (Closes: #447278). -- A Mennucc1 Fri, 19 Oct 2007 21:01:17 +0200 mplayer (1.0~rc2-3) unstable; urgency=low * vidix drivers cyberblade sis unichrome fail on alpha, and are probably useless but in x86_32 and x86_64 archs -- A Mennucc1 Fri, 19 Oct 2007 18:10:59 +0200 mplayer (1.0~rc2-2) unstable; urgency=low * Runtime CPU detection only works for x86, x86-64 and PPC -- A Mennucc1 Fri, 19 Oct 2007 09:43:08 +0200 mplayer (1.0~rc2-1) unstable; urgency=low * New upstream version. * Remove RTC debconf question and /etc/init.d/mplayer (Closes: #421363) * Use dpatch. -- A Mennucc1 Wed, 18 Oct 2007 19:27:16 +0200 mplayer (1.0~rc1-16.1) unstable; urgency=high * Non-maintainer upload by testing security team. * Check wLongsPerEntry in aviheader.c before using it to prevent possible NULL pointer dereference (CVE-2007-4938) (Closes: #443478). -- Nico Golde Tue, 25 Sep 2007 12:39:15 +0200 mplayer (1.0~rc1-16) unstable; urgency=low * compile for --mcpu=ev5 on alpha; fixes "Illegal instruction on EV56", thanks to Tom Evans & Ivan Jager (Closes: #431139). * removed debian/patches (Closes: #409352). * correct mplayer.config to respect font default, thanks Simon Ruggier. * linked with liblivemedia, thanks to Hilmar Preusse (Closes: #440338). -- A Mennucc1 Sat, 01 Sep 2007 12:27:16 +0000 mplayer (1.0~rc1-15) unstable; urgency=low * Bug fix: "Depends on libconfhelper-perl, but this package has been removed", thanks to David (Closes: #434509). * Bug fix: "correction for binary_codecs.sh", thanks to nutzteil@web.de (Closes: #431537). -- A Mennucc1 Wed, 1 Aug 2007 11:54:40 +0200 mplayer (1.0~rc1-14) unstable; urgency=high * fix for stack overflow in the code used to handle cddb queries, CVE-2007-2948 and SAID 24302, thanks Stefan Cornelius of Secunia Research * do not use libmad0, on request of upstream * [INTL:ml] Malayalam debconf template translation thanks to Santhosh Thottingal (Closes: #419527). * [INTL:it] Italian debconf templates translation thanks to Luca Monducci (Closes: #425259). * [l10n:ro] Romanian debconf templates translation thanks to Eddy Petrișor (Closes: #415368). -- A Mennucc1 Wed, 6 Jun 2007 10:17:22 +0200 mplayer (1.0~rc1-13) unstable; urgency=low * fix for CVE-2007-1246 and similar (Closes: #414075) thanks Kees Cook & Moritz Jodeitand & R Togni patches for files loader/dmo/DMO_VideoDecoder.c from SVN 22204 loader/dshow/DS_VideoDecoder.c from SVN 22205 * [INTL] Japanese po-debconf templates translation, thanks to Kobayashi Noritada (Closes: #413120). * [INTL] Dutch po-debconf translation, thanks cobaco (Closes: #413880) * [INTL] Russian po-debconf translation, thanks Yuri Kozlov (Closes: #414251) * patch for ia64 unaligned access crash, thanks to Bryan Stillwell for debugging & Reimar Döffinger for the patch (Closes: #409431). * mplayer-doc: add doc-base documentation indexes, thanks to Martintxo (Closes: #405945). * binary_codecs.sh: check MD5 on downloaded stuff (Closes: #405371). * binary_codecs.sh: check if bzip2 is there, and bail out graciously otherwise; if untarring fails, allow for retry. Fixes "binary_codecs.sh doesn't install already downloaded codecs", thanks to Ingo Bressler for problem analysis (Closes: #413063). * binary_codecs.sh: do not use fping (my code lost part of URLs) (closes: #399144) * binary_codecs.sh: warn that essential-ppc codecs need libstdc++5, thanks to Bin Zhang (Closes: #404473) for pointing out. * enable smb:// (Closes: #412079). * mplayer.postinst: when vo=x11 or vo=fbdev, zoom=1 is set as well, thanks to Robert Millan (Closes: #412252). * -stop-xscreensaver option disables gnome-screensaver as well (but only if cursor is inside mplayer window) , thanks Adam Tlałka and Reimar Döffinger (Closes: #404975). * [INTL] fix small typo in English template, thanks cobaco (closes: #414393) * [INTL] devices.html -> video.html , thanks cobaco (closes: #414392) * [INTL] True Type -> TrueType , thanks cobaco (closes: #414394) * [INTL] ~/.mplayer/mplayer.conf -> ~/.mplayer/config , thanks Jacobo Tarrio (closes: #408055) -- A Mennucc1 Sat, 10 Mar 2007 12:57:16 +0100 mplayer (1.0~rc1-12) unstable; urgency=medium * (possible) security fixes backported from SVN 7585 7586 7591 for libavcodec/h264.c 7640 7650 for libavformat/asf.c all thanks to Michael Niedermeyer * Czech debconf translation; thanks to Miroslav Kure (Closes: #408626). * Portuguese debconf translation; thanks to Traduz! (Closes: #408449). * Swedish debconf translation; thanks to Andreas Henriksson (Closes: #407864). * binary_codecs.sh should specify umask; thanks to Linas Žvirblis (Closes: #406346). * clarify dependencies (do not pick up them randomly!), thanks to EspeonEefi (Closes: #405170); debian/rules: when configuring, disable also: arts , jack , aa , dv , smb debian/control: depend on: lzo, speex, dts, ladspa, gl (mesa) * the above adds opengl video output (Closes: #400934). * forked processes cannot use GTK gui; this fixes bug in caching streams in gmplayer (Closes: #396962) thanks to martin f krafft and Reimar Döffinger for patch. * added in debian/patches all patches that I applied or I am working on -- A Mennucc1 Wed, 31 Jan 2007 10:30:24 +0100 mplayer (1.0~rc1-11) unstable; urgency=high * fix for CVE-2006-6172 * fixed "typo in the README.Debian", thanks to Aurelien Jacobs (Closes: #403893). * another (last?) fix for (Closes: #402950), thanks Sam Hocevar. -- A Mennucc1 Thu, 28 Dec 2006 23:03:42 +0100 mplayer (1.0~rc1-10) unstable; urgency=high * really apply patch for (Closes: #403379) * many fixes to various codecs, to prevent crashes on randomly altered streams -- A Mennucc1 Mon, 18 Dec 2006 11:46:35 +0100 mplayer (1.0~rc1-9) unstable; urgency=low * fix another segfault on (broken) MPEGs without I frames (Closes: #403379). * fix: binary_codecs.sh failed to install essential-ppc codecs, thanks to Bin Zhang (Closes: #403442). -- A Mennucc1 Sun, 17 Dec 2006 13:06:43 +0100 mplayer (1.0~rc1-8) unstable; urgency=low * fix segfault on (broken) MPEGs without I frames, (Closes: #402922). * README.Debian: document apt pinning and debian-multimedia * can be compiled with --enable-debug (Closes: #402920). * supports DEB_BUILD_OPTIONS=nostrip/noopt (Closes: #402950) (see README.Debian, though, for gory details) * Spanish po-debconf translation", thanks to Javier Fernández-Sanguino Peña (Closes: #402205). * patch to compile in GNU/kFreeBSD, thanks to Petr Salinger (Closes: #402872). -- A Mennucc1 Fri, 15 Dec 2006 14:40:54 +0100 mplayer (1.0~rc1-7) unstable; urgency=low * Bug fix: "mplayer: FTBFS on AMD64", thanks to Emfox Zhou (Closes: #401893). -- A Mennucc1 Thu, 7 Dec 2006 14:26:10 +0100 mplayer (1.0~rc1-6) unstable; urgency=low * debian/control : update mantainer fields * debian/scripts/binary_codecs.sh : 'wget -c -N' -> 'wget -N' * update debian/prefs/codecs_list and mirrors (closes: #399144) * debian/rules : x86_64 -> amd64 (closes: #401697) * applied patch (that should support codecs in amd64 ) http://people.freedesktop.org/~jinghua/real64/mplayer-amd64-real-codecs.diff * update french translation (closes: #400106) * update german translation (closes: #400296) * (again!) set --with-codecsdir to avoid broken default; thanks to Emfox Zhou (Closes: #396017). -- A Mennucc1 Wed, 6 Dec 2006 10:56:02 +0100 mplayer (1.0~rc1-5) unreleased; urgency=low * this version was built with external ffmpeg 0.svn6767 it is in http://tonelli.sns.it/pub/mplayer/experimental-shared -- A Mennucc Mon, 27 Nov 2006 15:03:02 +0100 mplayer (1.0~rc1-4) unstable; urgency=low * Depends on mplayer-skin * Use fontconfig in /etc/mplayer/mplayer.conf , so that 'Sans' is always a fallback; this solves: "OSD missing numbers/letters", thanks to Sam Morris (Closes: #396531). if fc-list is available, let the user choose between a huge list as well * Bug fix: "mplayer: depends exclusively on debconf (debconf-2.0 should be an alternative)", thanks to Eddy Petrișor (Closes: #397891). * Patches from Diego Biurrun : - README.jfdct.gz is already copied inside libavcodec/jfdctfst.c libavcodec/jfdctint.c - do not use external libdv (ffmpeg has internally a better one) - rename win32codecs.sh to binary_codecs.sh, * Bug fix: "mplayer: win32codecs.sh will not uninstall", thanks to Joey Morris (Closes: #397867) and Diego for the patch. * Applied some changes in debconf template, thanks to Helge Kreutzmann (Closes: #397819). * Supports caca (Closes: #397749). * "Initial German debconf translation", thanks to Helge Kreutzmann (Closes: #397822). * "French program translation", thanks to Yves Rutschle (Closes: #398515). * Bug fix: "FTBFS: bashisms in build scripts", thanks to Florent Bayle (Closes: #396450). -- A Mennucc1 Sun, 19 Nov 2006 21:06:01 +0100 mplayer (1.0~rc1-3) unstable; urgency=low * Bug fix: "Outdated info in /usr/share/doc/mplayer/README.Debian", thanks to Sam Morris (Closes: #396281). * set --with-codecsdir to avoid broken default; thanks to Emfox Zhou (Closes: #396017). -- A Mennucc1 Tue, 31 Oct 2006 09:13:32 +0100 mplayer (1.0~rc1-2) unstable; urgency=low * rewrote mplayer.{config,template,postinst} ; this also fixes "mplayer: Strange contents of default config file", thanks to Sam Morris (Closes: #395829). * Reviewed description, thanks to Filipus Klutiero (Closes: #395540). * Use po-debconf [Diego suggested:] * Don't install codecs.conf. If people fiddle w/ it, playback *will* break. * --disable-bitmap-font, so no more "annoying message on 'ttf doesn't look like a bitmap '", thanks to Michael Piefel (Closes: #395325) and Diego -- A Mennucc1 Sat, 28 Oct 2006 17:49:41 +0200 mplayer (1.0~rc1-1) unstable; urgency=low * New upstream release * -nortc is now default since -rtc has disadvantages with recent kernels ( so the mplayer/rtc question is now low priority, defaults to false ) * do not pass --enable-directfb (it fails) * reorganized debian/rules file (Closes: #395238,#395240,#395303). * reformat of scripts/win32codecs.sh -- A Mennucc1 Thu, 26 Oct 2006 12:55:33 +0200 mplayer (1.0~rc1~svn20199-1) unstable; urgency=low * code pulled from SVN (and some dirs deleted : see 'debian/rules fix-orig-source') * do not depend on xmms * build libraries with -fPIC * ship in examples dir: etc/menu.conf etc/input.conf etc/codecs.conf -- A Mennucc1 Fri, 13 Oct 2006 11:41:47 +0200 mplayer (1.0~rc1~svn19921) unstable; urgency=low * code pulled from SVN (and some dirs deleted : see 'debian/rules fix-orig-source') * better debian/copyright file * fixed some lintian issues * new debian/rules targets that build a tar from SVN * updated various README.Debian files (regarding all the upstream code not shipped into Debian) * 'debian/rules autocontrol' ( generates control.in -> control ) also adds dependencies for creating docs (if it is needed) * in debconf, question on -vo is low priority, default is "autodetect" (that is, no setting) * mplayer init supports LSB -- A Mennucc1 Sun, 21 Sep 2006 10:08:27 +0200 mplayer (1.0pre8-1) unstable; urgency=low * New upstream release * better debian/copyright file * do not ship a skin -- A Mennucc1 Sun, 30 Jul 2006 12:25:14 +0200 mplayer (1.0pre7try2-1) unstable; urgency=low * New upstream release * changed DEB_BUILD_OPTIONS to DEB_BUILD_CONFIGURE , DEB_BUILD_OPTIONS is used as in debian policy * use gcc-3.4 * changed xlibs-dev to a long list of dependencies, for Debian/etch * try to adhere to http://www.mplayerhq.hu/DOCS/tech/binary-packaging.txt (see README.Debian for details) * removed dependency on xlibmesa-dev, disabled opengl -- A Mennucc1 Mon, 16 Jan 2006 11:47:33 +0100 mplayer (1.0pre7-1) unstable; urgency=low * New upstream release -- A Mennucc1 Sun, 24 Apr 2005 19:34:33 +0200 mplayer (1.0pre6a-4) unstable; urgency=low * Simon McVittie wonderful work: - Work around Debian bug #267442 (glibc's sys/uio.h and gcc's altivec.h have conflicting uses for __vector) by re-ordering #includes - Fix potential symlink attack in ./configure - Disable support for binary codecs on platforms for which those codecs aren't available; also disable the corresponding Debconf note when it's inappropriate - Changed Build-Depends: so it works in pbuilder - Explicitly build-depend on libjpeg62-dev, libfontconfig1-dev, libungif4-dev - Tweak debian/rules to avoid certain errors being ignored - Use --language=all -- A Mennucc1 Sat, 5 Mar 2005 22:24:57 +0100 mplayer (1.0pre6a-3) unstable; urgency=low * provide a target 'debian/rules get-orig-source' that recreates the orig.tar.gz ; then use the above orig.tar.gz * rewrote some parts of debian/rules * don't clean and recompile docs if upstream ships them * mplayer-doc was shipping too much stuff * translated man pages where not installed properly * compile with libdv4-dev * correct README.Debian -- A Mennucc1 Tue, 20 Feb 2005 14:30:19 +0100 mplayer (1.0pre6a-2) unstable; urgency=low * Forgot build-dep on libtheora * Must not depend on libxvidcore -- A Mennucc1 Mon, 14 Feb 2005 14:47:56 +0100 mplayer (1.0pre6a-1) unstable; urgency=low * New upstream release -- A Mennucc1 Fri, 11 Feb 2005 19:33:42 +0100 mplayer (1.0-cvs20030324-2) unstable; urgency=low * some corrections, as suggested Diego Biurrun - binary codecs should go into /usr/lib/codecs (upstream default) - better template 'mplayer/install_codecs' - an empty 'font=' in mplayer.conf breaks mplayer: postinst corrected * correction in 'mplayer/cfgnote' * better mplayer.postinst and mplayer.config -- A Mennucc1 Sun, 18 Apr 2004 17:25:37 +0200 mplayer (1.0.cvs20030324-1) unstable; urgency=low * following the discussion started by Diego Biurrun in debian-devel, I have prepared a new packaging of 'mplayer' (with code that comes from CVS) * the upstream tar.bz cannot be distributed by Debian, since it contains CSS code; so I am repackaging it * I have tried my best to address all known issues: - the package contains the detailed Copyright made by Diego Biurrun - the package does not contain CSS code, or AFAIK other code on which there is active patent enforcement - there is a script debian/cvs-changelog.sh that shows all changes done to files included in this source. This should comply with GPLv2 sec 2.a (in spirit if not in letter) For this reason, the source code contains CVS directories. * needs make (>= 3.80) for 'html-chunked-$(1)' in DOCS/xml/Makefile -- A Mennucc1 Wed, 30 Mar 2004 18:04:06 +0100 mplayer (0.90-3) unstable; urgency=low * changed description to stress that the .tar.gz in Debian is different from the upstream (following suggested by Edward Block) * --enable-fbdirect in configure * uploaded to Debian -- A Mennucc1 Fri, 1 Aug 2003 16:21:50 +0200 mplayer (0.90-2) unstable; urgency=low * removed all CSS code. Now mplayer use lib dvdread -- A Mennucc1 Fri, 25 Jul 2003 10:50:26 +0200 mplayer (0.90-1) unstable; urgency=low * uploaded to Debian. The source code was scrutinized for licenses and copyrights. Read copyright for a detailed discussion. -- A Mennucc1 Wed, 23 Jul 2003 09:45:41 +0200 mplayer (0.90) unstable; urgency=low * version bumped -- Gabucino Sun, 16 Feb 2003 11:02:51 +0100 mplayer (0.90rc4-1) unstable; urgency=low * new rc-release -- A Mennucc1 Mon, 24 Feb 2003 18:40:13 +0100 mplayer (0.90rc3-2) unstable; urgency=low * configure: --disable-dvdnav --enable-mpdvdkit --disable-aa --disable-ggi on suggestions from author(s) -- A Mennucc1 Thu, 23 Jan 2003 14:12:50 +0100 mplayer (0.90rc3-1) unstable; urgency=low * show notes in config, not template * default device in Debian is usually /dev/cdrom, not /dev/dvd -- A Mennucc1 Mon, 20 Jan 2003 15:54:57 +0100 mplayer (0.90rc2-5) unstable; urgency=low * ftp-installer: Please read README.Debian.2 * other adjustments to debian/* * notes in the templates were not showing, due to a missing go(); -- A Mennucc1 Thu, 16 Jan 2003 10:02:43 +0100 mplayer (0.90rc2-4) unstable; urgency=low * #DEBHELPER# in postinst was not working OK (not passing arguments) * template mplayer/install_codecs was not showing -- Andrea Mennucc Tue, 14 Jan 2003 09:48:44 +0100 mplayer (0.90rc2-3) unstable; urgency=low * Thanks to Nagy for teaming up. His are mime and conffile and scripts. -- Andrea Mennucc Mon, 13 Jan 2003 16:46:22 +0100 mplayer (0.90rc2-2) unstable; urgency=low * pass control to debconf scripts in postinst and postrm * purge debconf database on purge. -- Dariush Pietrzak Sun, 12 Jan 2003 15:01:38 +0100 mplayer (0.90rc3-0) unstable; urgency=low * new release. -- Gabucino Mon, 16 Dec 2002 22:03:55 +0100 mplayer (0.90rc1-0) unstable; urgency=low * new release. * now compiled with --enable-runtime-cpudetection for safety reasons. Disable it for slightly better performance, but the package will run only on the CPU the build machine had. * updated package description -- Gabucino Sun, 24 Nov 2002 17:01:12 +0100 mplayer (0.90pre9-0) unstable; urgency=low * new release. -- Dariush Pietrzak Mon, 21 Oct 2002 22:30:06 +0200 mplayer (0.90pre8-0) unstable; urgency=low * new release, fix version, we are not at 0.90, we're still at preX -- Dariush Pietrzak Thu, 19 Sep 2002 09:50:43 +0200 mplayer (0.90-4) unstable; urgency=low * Fix package building by adding BINDIR. -- Diego Biurrun Wed, 4 Sep 2002 00:49:03 +0200 mplayer (0.90-3) unstable; urgency=low * Remove configuration files on purge. -- Diego Biurrun Sun, 1 Sep 2002 11:03:13 +0200 mplayer (0.90-2) unstable; urgency=low * Use the confdir we compile with in the helper scripts (/etc/mplayer/mplayer.conf instead of /etc/mplayer). -- Diego Biurrun Tue, 27 Aug 2002 11:18:50 +0200 mplayer (0.90-1) unstable; urgency=low * 0.90 release including latest alsa9 fixes -- Dariush Pietrzak Wed, 3 Jul 2002 23:32:49 +0200 mplayer (0.90pre5-1) unstable; urgency=low * rc1 to become 0.90 -- Dariush Pietrzak Fri, 7 Jun 2002 15:31:20 +0200 mplayer (0.90pre4-1) unstable; urgency=low * new pre-release -- Dariush Pietrzak Mon, 13 May 2002 08:06:34 +0200 mplayer (0.90pre3-1) unstable; urgency=low * new pre-release * gtk bug fixed. -- Dariush Pietrzak Tue, 30 Apr 2002 11:32:43 +0200 mplayer (0.90pre2-1) unstable; urgency=low * new release. -- Dariush Pietrzak Sun, 21 Apr 2002 12:49:35 +0200 mplayer (0.60-3) unstable; urgency=low * install xvidix correctly -- Dariush Pietrzak Sun, 17 Mar 2002 16:38:54 +0100 mplayer (0.60-2) unstable; urgency=low * This is meaningless, just to mark that more then 2 months have passed since last release and lots of thing in mplayer have changed. -- Dariush Pietrzak Thu, 7 Mar 2002 00:34:20 +0100 mplayer (0.60-1) unstable; urgency=low * Post 0.60 release. * Changed installation - make install now handles codecs.conf, manpages * and fontdir, so we now use make install for those. -- Dariush Pietrzak Fri, 4 Jan 2002 11:28:54 +0100 mplayer (0.60pre2-1) unstable; urgency=low * 0.60 pre2 release -- Dariush Pietrzak Fri, 28 Dec 2001 22:12:54 +0100 mplayer (0.60pre1-1) unstable; urgency=low * 0.60 pre-release. -- Dariush Pietrzak Tue, 25 Dec 2001 00:47:36 +0100 mplayer (0.50-3) unstable; urgency=low * debian/rules: improve install routine; will include mencore if it is built * debian/control: remove invalid source recommends * debian/copyright: mention that binary distribution is not allowed * debian/rules: install /usr/share/mplayer/codecs.conf; this should probably be a config file * turn on fbdev option -- Adam Di Carlo Sat, 15 Dec 2001 03:33:44 -0500 mplayer (0.50-2) unstable; urgency=low * gui added to package/menu -- Dariush Pietrzak Wed, 7 Nov 2001 11:31:46 +0100 mplayer (0.50-1) unstable; urgency=low * 0.50 released. -- Dariush Pietrzak Fri, 12 Oct 2001 13:26:03 +0200 mplayer (0.18-4) unstable; urgency=low * Changes to debian packaging suggested Josip Rodin -- Dariush Pietrzak Wed, 22 Aug 2001 22:40:58 +0200 mplayer (0.18-3) unstable; urgency=low * fixed templates. -- Dariush Pietrzak Sat, 28 Jul 2001 09:45:45 +0200 mplayer (0.18-2) unstable; urgency=low * modified debian scripts -- Dariush Pietrzak Fri, 27 Jul 2001 09:25:52 +0200 mplayer (0.18-1) unstable; urgency=low * lots of changes in mplayer -- Dariush Pietrzak Mon, 25 Jun 2001 15:59:18 +0200 mplayer (0.17a-2) unstable; urgency=low * mplayer.conf file, automatic menu files update -- Dariush Pietrzak Sun, 20 May 2001 22:50:41 +0200 mplayer (0.17a-1) unstable; urgency=low * Version change, debian scripts update (rm), maintainer switch -- Dariush Pietrzak Thu, 17 May 2001 13:25:12 +0200 mplayer (0.11pre-1) unstable; urgency=low * Initial release. -- * TeLeNiEkO * Mon, 26 Feb 2001 12:24:04 +0100 debian/mplayer-doc.docs0000644000000000000000000000003612304130614012245 0ustar Copyright DOCS/HTML DOCS/tech debian/mplayer-doc.doc-base.ru0000644000000000000000000000062212304130614013420 0ustar Document: mplayer-ru Title: MPlayer documentation (Russian) Author: The MPlayer team Abstract: This documentation describes the use of MPlayer. (Russian) MPlayer is a movie player for GNU/Linux that supports a wide range of audio and video formats, and output drivers. Section: Sound Format: HTML Index: /usr/share/doc/mplayer-doc/HTML/ru/index.html Files: /usr/share/doc/mplayer-doc/HTML/ru/*.html debian/compat0000644000000000000000000000000212304130614010356 0ustar 7 debian/mplayer-doc.doc-base.en0000644000000000000000000000062212304130614013374 0ustar Document: mplayer-en Title: MPlayer documentation (English) Author: The MPlayer team Abstract: This documentation describes the use of MPlayer. (English) MPlayer is a movie player for GNU/Linux that supports a wide range of audio and video formats, and output drivers. Section: Sound Format: HTML Index: /usr/share/doc/mplayer-doc/HTML/en/index.html Files: /usr/share/doc/mplayer-doc/HTML/en/*.html debian/mplayer-doc.doc-base.pl0000644000000000000000000000062012304130614013403 0ustar Document: mplayer-pl Title: MPlayer documentation (Polish) Author: The MPlayer team Abstract: This documentation describes the use of MPlayer. (Polish) MPlayer is a movie player for GNU/Linux that supports a wide range of audio and video formats, and output drivers. Section: Sound Format: HTML Index: /usr/share/doc/mplayer-doc/HTML/pl/index.html Files: /usr/share/doc/mplayer-doc/HTML/pl/*.html debian/rules0000755000000000000000000001554312304131726010255 0ustar #!/usr/bin/make -f # This has to be exported to make some magic below work. export DH_OPTIONS # Support multiple makes at once ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) NUMJOBS = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) else # on i386 and amd64, we query the system unless overriden by DEB_BUILD_OPTIONS ifeq ($(DEB_BUILD_ARCH),i386) NUMJOBS := -j$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) else ifeq ($(DEB_BUILD_ARCH),amd64) NUMJOBS := -j$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) endif endif # do not run the actual rules of this makefile in parallel. sub-makes # can go in parallel .NOTPARALLEL: ############ DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p') DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p') UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//') SVN_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed -nr 's/^[0-9.:-~]+\+svn([0-9]+)$$/\1/p') DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_VENDOR ?= $(shell dpkg-vendor --query Vendor) # XXX enable-menu is frowned upon by upstream CONFIGURE_FLAGS = \ --prefix=/usr \ --confdir=/etc/mplayer \ --enable-xvmc \ --enable-menu \ --enable-radio --enable-radio-capture \ --disable-arts \ --language=all \ --disable-dvdread-internal \ --disable-libdvdcss-internal \ --disable-libmpeg2-internal \ --disable-ffmpeg_a \ $(archconf) ifeq ($(DEB_HOST_ARCH),i386) #configure optimizes for the cpu detected at ./configure time #in order to build a generic binary, avoid non-standard opcodes through gcc archconf += --target=i586-linux CONFIGURE_FLAGS += --enable-runtime-cpudetection endif ifeq ($(DEB_HOST_ARCH),amd64) CONFIGURE_FLAGS += --enable-runtime-cpudetection endif ifeq ($(DEB_HOST_ARCH),kfreebsd-i386) CONFIGURE_FLAGS += --enable-runtime-cpudetection endif ifeq ($(DEB_HOST_ARCH),kfreebsd-amd64) CONFIGURE_FLAGS += --enable-runtime-cpudetection endif ifeq ($(DEB_HOST_ARCH),powerpc) CONFIGURE_FLAGS += --enable-runtime-cpudetection endif # when run on a sparc64 kernel, configure will normally select v9 asm. # this is hidden when running on buildds with 32bit kernel personality. # because of #644856, this will currently lead to a FTBFS # therefore, we force a 'generic' target. ifeq ($(DEB_HOST_ARCH),sparc) archconf += --target=generic endif ifeq ($(DEB_HOST_ARCH),alpha) #Avoid high optimization through gcc. # see http://permalink.gmane.org/gmane.linux.debian.ports.alpha/7295 archconf += --target=alpha_ev5-linux endif # generate debugging symbols for mplayer-dbg for all archs but mipsen, # see bug #520113 ifeq (,$(findstring mips,$(DEB_HOST_ARCH))) CONFIGURE_FLAGS += --enable-debug endif ifeq (linux,$(DEB_HOST_ARCH_OS)) CONFIGURE_FLAGS += --enable-joystick sound_backend := alsa else sound_backend := oss endif build: build-arch build-indep ####### build-arch build-arch: dh_testdir dh_prep -a test -f VERSION || \ echo "svn r$(SVN_VERSION) ($(DEB_VENDOR)), built with gcc" > VERSION $(MAKE) -f debian/rules debian/mplayer/usr/bin/mplayer $(MAKE) -f debian/rules debian/mencoder/usr/bin/mencoder $(MAKE) -f debian/rules debian/mplayer-gui/usr/bin/gmplayer # build non-gui version # & mencoder debian/mplayer/usr/bin/mplayer debian/mencoder/usr/bin/mencoder: dh_testdir $(CLEAN_ENV) \ ./configure $(CONFIGURE_FLAGS) --disable-gui $(CLEAN_ENV) \ $(MAKE) $(NUMJOBS) mplayer mencoder V=1 $(MAKE) install-mplayer DESTDIR=$(CURDIR)/debian/mplayer $(MAKE) install-mplayer-man DESTDIR=$(CURDIR)/debian/mplayer $(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder $(MAKE) install-mencoder-man DESTDIR=$(CURDIR)/debian/mplayer install -D -m 644 debian/mplayer.conf \ $(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf sed -e "s/@SOUND_BACKEND@/$(sound_backend)/" -i \ $(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf # build gui version debian/mplayer-gui/usr/bin/gmplayer: dh_testdir $(CLEAN_ENV) \ ./configure $(CONFIGURE_FLAGS) --enable-gui $(CLEAN_ENV) \ $(MAKE) $(NUMJOBS) mplayer install -D -m 755 mplayer $(CURDIR)/debian/mplayer-gui/usr/bin/gmplayer install -D -m 644 etc/mplayer.desktop \ $(CURDIR)/debian/mplayer-gui/usr/share/applications/mplayer.desktop install -D -m 644 etc/mplayer16x16.png \ $(CURDIR)/debian/mplayer-gui/usr/share/icons/hicolor/16x16/apps/mplayer.png install -D -m 644 etc/mplayer22x22.png \ $(CURDIR)/debian/mplayer-gui/usr/share/icons/hicolor/22x22/apps/mplayer.png install -D -m 644 etc/mplayer24x24.png \ $(CURDIR)/debian/mplayer-gui/usr/share/icons/hicolor/24x24/apps/mplayer.png install -D -m 644 etc/mplayer32x32.png \ $(CURDIR)/debian/mplayer-gui/usr/share/icons/hicolor/32x32/apps/mplayer.png install -D -m 644 etc/mplayer48x48.png \ $(CURDIR)/debian/mplayer-gui/usr/share/icons/hicolor/48x48/apps/mplayer.png install -D -m 644 etc/mplayer256x256.png \ $(CURDIR)/debian/mplayer-gui/usr/share/icons/hicolor/256x256/apps/mplayer.png # binaries already installed via build rules as we have to build several flavors install-arch: build-arch ###### build-indep DOCS/HTML/en/index.html: $(MAKE) html-chunked build-indep: dh_testdir dh_prep -i test -f DOCS/HTML/en/index.html || $(MAKE) -f debian/rules DOCS/HTML/en/index.html # commands to compile the documentation install-indep: build-indep dh_installchangelogs -i dh_installdocs -i dh_compress -i dh_fixperms -i ################ clean clean: dh_testdir dh_testroot -test -f config.mak && $(MAKE) distclean # Build architecture-independent packages binary-indep: install-indep # Build architecture-dependent packages binary-arch: install-arch dh_testdir dh_testroot dh_install -a dh_installchangelogs -a dh_installdocs -a dh_installexamples -a dh_installmenu -a dh_installmime -a dh_installman -a dh_strip -a --dbg-package=mplayer-dbg dh_link dh_compress -a dh_fixperms -a dh_makeshlibs -a dh_installdeb dh_shlibdeps -- --ignore-missing-info dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch PHONY += build clean binary-indep binary-arch binary-common binary PHONY += install binary binary-arch binary-indep clean checkroot get-orig-source PHONY += autocontrol fix-orig-source copy-orig-from-svn download-and-unpack-orig .PHONY: $(PHONY) include /usr/share/dpkg/default.mk get-orig-source: wget -O $(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz "http://anonscm.debian.org/gitweb/?p=pkg-multimedia/mplayer.git;a=snapshot;h=0d88e9ff9fd4a5c21ecf85bc7f66f1d303d1cc8d;sf=tgz" debian/patches/0000755000000000000000000000000013350163377010625 5ustar debian/patches/62-libav-0.8.patch0000644000000000000000000000067112304130640013460 0ustar --- mplayer-1.0~svn34750.orig/libmpcodecs/vd_ffmpeg.c +++ mplayer-1.0~svn34750/libmpcodecs/vd_ffmpeg.c @@ -47,6 +47,18 @@ #include "libavcodec/avcodec.h" +#ifndef AV_EF_COMPLIANT +#define AV_EF_COMPLIANT 0 +#endif + +#ifndef AV_EF_CAREFUL +#define AV_EF_CAREFUL 0 +#endif + +#ifndef AV_EF_AGGRESSIVE +#define AV_EF_AGGRESSIVE 0 +#endif + #if AVPALETTE_SIZE > 1024 #error palette too large, adapt libmpcodecs/vf.c:vf_get_image #endif debian/patches/50_Hurd_PATH_MAX.patch0000644000000000000000000001533012304130640014360 0ustar Author: Samuel Thibault Description: fix FTBFS on the Hurd Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974 --- a/libmenu/menu_filesel.c +++ b/libmenu/menu_filesel.c @@ -16,6 +16,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef __GNU__ +#define _GNU_SOURCE +#endif #include #include #include @@ -418,7 +421,11 @@ static void clos(menu_t* menu) { static int open_fs(menu_t* menu, char* args) { char *path = mpriv->path; int r = 0; +#ifdef __GNU__ + char *wd, *b = NULL; +#else char wd[PATH_MAX+1], b[PATH_MAX+1]; +#endif args = NULL; // Warning kill menu->draw = menu_list_draw; @@ -447,7 +454,11 @@ static int open_fs(menu_t* menu, char* a } } +#ifdef __GNU__ + wd = get_current_dir_name(); +#else getcwd(wd,PATH_MAX); +#endif if (!path || path[0] == '\0') { #if 0 char *slash = NULL; @@ -466,13 +477,24 @@ static int open_fs(menu_t* menu, char* a path = wd; } if (path[0] != '/') { +#ifdef __GNU__ + if(path[strlen(path)-1] != '/') + asprintf(&b,"%s/%s/",wd,path); + else + asprintf(&b,"%s/%s",wd,path); +#else if(path[strlen(path)-1] != '/') snprintf(b,sizeof(b),"%s/%s/",wd,path); else snprintf(b,sizeof(b),"%s/%s",wd,path); +#endif path = b; } else if (path[strlen(path)-1]!='/') { +#ifdef __GNU__ + asprintf(&b,"%s/",path); +#else sprintf(b,"%s/",path); +#endif path = b; } if (menu_chroot && menu_chroot[0] == '/') { @@ -483,13 +505,22 @@ static int open_fs(menu_t* menu, char* a if (menu_chroot[l] == '/') path = menu_chroot; else { +#ifdef __GNU__ + asprintf(&b,"%s/",menu_chroot); +#else sprintf(b,"%s/",menu_chroot); +#endif path = b; } } } r = open_dir(menu,path); +#ifdef __GNU__ + free(wd); + free(b); +#endif + return r; } --- a/libmpdemux/mf.c +++ b/libmpdemux/mf.c @@ -16,6 +16,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef __GNU__ +#define _GNU_SOURCE +#endif #include #include #include @@ -64,8 +67,13 @@ mf_t* open_mf(char * filename){ FILE *lst_f=fopen(filename + 1,"r"); if ( lst_f ) { +#ifdef __GNU__ + fname=NULL; + while ( getline( &fname, 0, lst_f ) >= 0 ) +#else fname=malloc(PATH_MAX); while ( fgets( fname,PATH_MAX,lst_f ) ) +#endif { /* remove spaces from end of fname */ char *t=fname + strlen( fname ) - 1; @@ -80,6 +88,10 @@ mf_t* open_mf(char * filename){ mf->names[mf->nr_of_files]=strdup( fname ); mf->nr_of_files++; } +#ifdef __GNU__ + free( fname ); + fname=NULL; +#endif } fclose( lst_f ); --- a/stream/stream_bd.c +++ b/stream/stream_bd.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef __GNU__ +#define _GNU_SOURCE +#endif + #include #include #include @@ -146,7 +150,11 @@ static void id2str(const uint8_t *id, in static int find_vuk(struct bd_priv *bd, const uint8_t discid[20]) { char line[1024]; +#ifdef __GNU__ + char *filename; +#else char filename[PATH_MAX]; +#endif const char *home; int vukfound = 0; stream_t *file; @@ -154,13 +162,23 @@ static int find_vuk(struct bd_priv *bd, // look up discid in KEYDB.cfg to get VUK home = getenv("HOME"); +#ifdef __GNU__ + asprintf(&filename, "%s/.dvdcss/KEYDB.cfg", home); +#else snprintf(filename, sizeof(filename), "%s/.dvdcss/KEYDB.cfg", home); +#endif file = open_stream(filename, NULL, NULL); if (!file) { mp_msg(MSGT_OPEN,MSGL_ERR, "Cannot open VUK database file %s\n", filename); +#ifdef __GNU__ + free(filename); +#endif return 0; } +#ifdef __GNU__ + free(filename); +#endif id2str(discid, 20, idstr); while (stream_read_line(file, line, sizeof(line), 0)) { char *vst; @@ -205,23 +223,40 @@ static int bd_get_uks(struct bd_priv *bd struct AVAES *a; struct AVSHA *asha; stream_t *file; +#ifdef __GNU__ + char *filename; +#else char filename[PATH_MAX]; +#endif uint8_t discid[20]; char idstr[ID_STR_LEN]; +#ifdef __GNU__ + asprintf(&filename, BD_UKF_PATH, bd->device); +#else snprintf(filename, sizeof(filename), BD_UKF_PATH, bd->device); +#endif file = open_stream(filename, NULL, NULL); if (!file) { mp_msg(MSGT_OPEN, MSGL_ERR, "Cannot open file %s to get UK and DiscID\n", filename); +#ifdef __GNU__ + free(filename); +#endif return 0; } file_size = file->end_pos; if (file_size <= 0 || file_size > 10 * 1024* 1024) { mp_msg(MSGT_OPEN, MSGL_ERR, "File %s too large\n", filename); free_stream(file); +#ifdef __GNU__ + free(filename); +#endif return 0; } +#ifdef __GNU__ + free(filename); +#endif buf = av_malloc(file_size); stream_read(file, buf, file_size); free_stream(file); @@ -412,15 +447,29 @@ static void get_clipinf(struct bd_priv * { int i; int langmap_offset, index_offset, end_offset; +#ifdef __GNU__ + char *filename; +#else char filename[PATH_MAX]; +#endif stream_t *file; +#ifdef __GNU__ + asprintf(&filename, BD_CLIPINF_PATH, bd->device, bd->title); +#else snprintf(filename, sizeof(filename), BD_CLIPINF_PATH, bd->device, bd->title); +#endif file = open_stream(filename, NULL, NULL); if (!file) { mp_msg(MSGT_OPEN, MSGL_ERR, "Cannot open clipinf %s\n", filename); +#ifdef __GNU__ + free(filename); +#endif return; } +#ifdef __GNU__ + free(filename); +#endif if (stream_read_qword(file) != AV_RB64("HDMV0200")) { mp_msg(MSGT_OPEN, MSGL_ERR, "Unknown clipinf format\n"); return; @@ -470,7 +519,11 @@ static int bd_stream_control(stream_t *s static int bd_stream_open(stream_t *s, int mode, void* opts, int* file_format) { +#ifdef __GNU__ + char *filename; +#else char filename[PATH_MAX]; +#endif struct stream_priv_s* p = opts; struct bd_priv *bd = calloc(1, sizeof(*bd)); @@ -507,9 +560,16 @@ static int bd_stream_open(stream_t *s, i // set up AES key from uk av_aes_init(bd->aeseed, bd->uks.keys[0].u8, 128, 0); +#ifdef __GNU__ + asprintf(&filename, BD_M2TS_PATH, bd->device, bd->title); +#else snprintf(filename, sizeof(filename), BD_M2TS_PATH, bd->device, bd->title); +#endif mp_msg(MSGT_OPEN, MSGL_STATUS, "Opening %s\n", filename); bd->title_file = open_stream(filename, NULL, NULL); +#ifdef __GNU__ + free(filename); +#endif if (!bd->title_file) return STREAM_ERROR; s->end_pos = bd->title_file->end_pos; debian/patches/62-libav-9.patch0000644000000000000000000004617412304130640013333 0ustar diff -urN MPlayer-1.1.orig//av_opts.c MPlayer-1.1/av_opts.c --- MPlayer-1.1.orig//av_opts.c 2012-01-28 14:51:57.000000000 +0100 +++ MPlayer-1.1/av_opts.c 2013-01-17 09:29:34.472213703 +0100 @@ -42,7 +42,7 @@ arg = strchr(str, '='); if(arg) *arg++= 0; - if(av_set_string3(v, str, arg, 0, NULL) < 0){ + if(av_opt_set(v, str, arg, 0) < 0){ free(start); return -1; } diff -urN MPlayer-1.1.orig//bstr.c MPlayer-1.1/bstr.c --- MPlayer-1.1.orig//bstr.c 2010-07-19 00:00:48.000000000 +0200 +++ MPlayer-1.1/bstr.c 2013-01-17 09:43:10.787183988 +0100 @@ -18,6 +18,7 @@ #include #include +#include #include "bstr.h" diff -urN MPlayer-1.1.orig//codec-cfg.c MPlayer-1.1/codec-cfg.c --- MPlayer-1.1.orig//codec-cfg.c 2012-05-08 12:56:22.000000000 +0200 +++ MPlayer-1.1/codec-cfg.c 2013-01-17 09:34:39.860202586 +0100 @@ -54,6 +54,7 @@ #include "help_mp.h" #include "libavutil/avutil.h" +#include "libavutil/common.h" #include "libmpcodecs/img_format.h" #include "codec-cfg.h" diff -urN MPlayer-1.1.orig//fmt-conversion.c MPlayer-1.1/fmt-conversion.c --- MPlayer-1.1.orig//fmt-conversion.c 2013-01-17 09:16:03.213243232 +0100 +++ MPlayer-1.1/fmt-conversion.c 2013-01-17 09:28:32.490215959 +0100 @@ -26,134 +26,134 @@ static const struct { int fmt; - enum PixelFormat pix_fmt; + enum AVPixelFormat pix_fmt; } conversion_map[] = { - {IMGFMT_ARGB, PIX_FMT_ARGB}, - {IMGFMT_BGRA, PIX_FMT_BGRA}, - {IMGFMT_BGR24, PIX_FMT_BGR24}, - {IMGFMT_BGR16BE, PIX_FMT_RGB565BE}, - {IMGFMT_BGR16LE, PIX_FMT_RGB565LE}, - {IMGFMT_BGR15BE, PIX_FMT_RGB555BE}, - {IMGFMT_BGR15LE, PIX_FMT_RGB555LE}, - {IMGFMT_BGR12BE, PIX_FMT_RGB444BE}, - {IMGFMT_BGR12LE, PIX_FMT_RGB444LE}, - {IMGFMT_BGR8, PIX_FMT_RGB8}, - {IMGFMT_BGR4, PIX_FMT_RGB4}, - {IMGFMT_BGR1, PIX_FMT_MONOBLACK}, - {IMGFMT_RGB1, PIX_FMT_MONOBLACK}, - {IMGFMT_RG4B, PIX_FMT_BGR4_BYTE}, - {IMGFMT_BG4B, PIX_FMT_RGB4_BYTE}, - {IMGFMT_RGB48LE, PIX_FMT_RGB48LE}, - {IMGFMT_RGB48BE, PIX_FMT_RGB48BE}, - {IMGFMT_ABGR, PIX_FMT_ABGR}, - {IMGFMT_RGBA, PIX_FMT_RGBA}, - {IMGFMT_RGB24, PIX_FMT_RGB24}, - {IMGFMT_RGB16BE, PIX_FMT_BGR565BE}, - {IMGFMT_RGB16LE, PIX_FMT_BGR565LE}, - {IMGFMT_RGB15BE, PIX_FMT_BGR555BE}, - {IMGFMT_RGB15LE, PIX_FMT_BGR555LE}, - {IMGFMT_RGB12BE, PIX_FMT_BGR444BE}, - {IMGFMT_RGB12LE, PIX_FMT_BGR444LE}, - {IMGFMT_RGB8, PIX_FMT_BGR8}, - {IMGFMT_RGB4, PIX_FMT_BGR4}, - {IMGFMT_BGR8, PIX_FMT_PAL8}, -// NB: This works only because PIX_FMT_0RGB32 is a CPP Macro. -// note that most other PIX_FMT values are enums -#ifdef PIX_FMT_0RGB32 - {IMGFMT_BGR32, PIX_FMT_0RGB32}, - {IMGFMT_BGRA, PIX_FMT_BGR0}, - {IMGFMT_RGBA, PIX_FMT_RGB0}, - {IMGFMT_RGB64LE, PIX_FMT_RGBA64LE}, - {IMGFMT_RGB64BE, PIX_FMT_RGBA64BE}, + {IMGFMT_ARGB, AV_PIX_FMT_ARGB}, + {IMGFMT_BGRA, AV_PIX_FMT_BGRA}, + {IMGFMT_BGR24, AV_PIX_FMT_BGR24}, + {IMGFMT_BGR16BE, AV_PIX_FMT_RGB565BE}, + {IMGFMT_BGR16LE, AV_PIX_FMT_RGB565LE}, + {IMGFMT_BGR15BE, AV_PIX_FMT_RGB555BE}, + {IMGFMT_BGR15LE, AV_PIX_FMT_RGB555LE}, + {IMGFMT_BGR12BE, AV_PIX_FMT_RGB444BE}, + {IMGFMT_BGR12LE, AV_PIX_FMT_RGB444LE}, + {IMGFMT_BGR8, AV_PIX_FMT_RGB8}, + {IMGFMT_BGR4, AV_PIX_FMT_RGB4}, + {IMGFMT_BGR1, AV_PIX_FMT_MONOBLACK}, + {IMGFMT_RGB1, AV_PIX_FMT_MONOBLACK}, + {IMGFMT_RG4B, AV_PIX_FMT_BGR4_BYTE}, + {IMGFMT_BG4B, AV_PIX_FMT_RGB4_BYTE}, + {IMGFMT_RGB48LE, AV_PIX_FMT_RGB48LE}, + {IMGFMT_RGB48BE, AV_PIX_FMT_RGB48BE}, + {IMGFMT_ABGR, AV_PIX_FMT_ABGR}, + {IMGFMT_RGBA, AV_PIX_FMT_RGBA}, + {IMGFMT_RGB24, AV_PIX_FMT_RGB24}, + {IMGFMT_RGB16BE, AV_PIX_FMT_BGR565BE}, + {IMGFMT_RGB16LE, AV_PIX_FMT_BGR565LE}, + {IMGFMT_RGB15BE, AV_PIX_FMT_BGR555BE}, + {IMGFMT_RGB15LE, AV_PIX_FMT_BGR555LE}, + {IMGFMT_RGB12BE, AV_PIX_FMT_BGR444BE}, + {IMGFMT_RGB12LE, AV_PIX_FMT_BGR444LE}, + {IMGFMT_RGB8, AV_PIX_FMT_BGR8}, + {IMGFMT_RGB4, AV_PIX_FMT_BGR4}, + {IMGFMT_BGR8, AV_PIX_FMT_PAL8}, +// NB: This works only because AV_PIX_FMT_0RGB32 is a CPP Macro. +// note that most other AV_PIX_FMT values are enums +#ifdef AV_PIX_FMT_0RGB32 + {IMGFMT_BGR32, AV_PIX_FMT_0RGB32}, + {IMGFMT_BGRA, AV_PIX_FMT_BGR0}, + {IMGFMT_RGBA, AV_PIX_FMT_RGB0}, + {IMGFMT_RGB64LE, AV_PIX_FMT_RGBA64LE}, + {IMGFMT_RGB64BE, AV_PIX_FMT_RGBA64BE}, #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 50, 0) - {IMGFMT_422A, PIX_FMT_YUVA422P}, + {IMGFMT_422A, AV_PIX_FMT_YUVA422P}, #endif #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 35, 101) - {IMGFMT_444A, PIX_FMT_YUVA444P}, + {IMGFMT_444A, AV_PIX_FMT_YUVA444P}, #endif #endif #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1) - {IMGFMT_GBR24P, PIX_FMT_GBRP}, + {IMGFMT_GBR24P, AV_PIX_FMT_GBRP}, #endif - {IMGFMT_YUY2, PIX_FMT_YUYV422}, - {IMGFMT_UYVY, PIX_FMT_UYVY422}, - {IMGFMT_NV12, PIX_FMT_NV12}, - {IMGFMT_NV21, PIX_FMT_NV21}, - {IMGFMT_Y800, PIX_FMT_GRAY8}, - {IMGFMT_Y8, PIX_FMT_GRAY8}, - {IMGFMT_YVU9, PIX_FMT_YUV410P}, - {IMGFMT_IF09, PIX_FMT_YUV410P}, - {IMGFMT_YV12, PIX_FMT_YUV420P}, - {IMGFMT_I420, PIX_FMT_YUV420P}, - {IMGFMT_IYUV, PIX_FMT_YUV420P}, - {IMGFMT_411P, PIX_FMT_YUV411P}, - {IMGFMT_422P, PIX_FMT_YUV422P}, - {IMGFMT_444P, PIX_FMT_YUV444P}, - {IMGFMT_440P, PIX_FMT_YUV440P}, - - {IMGFMT_420A, PIX_FMT_YUVA420P}, - - {IMGFMT_420P16_LE, PIX_FMT_YUV420P16LE}, - {IMGFMT_420P16_BE, PIX_FMT_YUV420P16BE}, - {IMGFMT_420P10_LE, PIX_FMT_YUV420P10LE}, - {IMGFMT_420P10_BE, PIX_FMT_YUV420P10BE}, - {IMGFMT_420P9_LE, PIX_FMT_YUV420P9LE}, - {IMGFMT_420P9_BE, PIX_FMT_YUV420P9BE}, - {IMGFMT_422P16_LE, PIX_FMT_YUV422P16LE}, - {IMGFMT_422P16_BE, PIX_FMT_YUV422P16BE}, - {IMGFMT_422P10_LE, PIX_FMT_YUV422P10LE}, - {IMGFMT_422P10_BE, PIX_FMT_YUV422P10BE}, - {IMGFMT_422P9_LE, PIX_FMT_YUV422P9LE}, - {IMGFMT_422P9_BE, PIX_FMT_YUV422P9BE}, - {IMGFMT_444P16_LE, PIX_FMT_YUV444P16LE}, - {IMGFMT_444P16_BE, PIX_FMT_YUV444P16BE}, - {IMGFMT_444P10_LE, PIX_FMT_YUV444P10LE}, - {IMGFMT_444P10_BE, PIX_FMT_YUV444P10BE}, - {IMGFMT_444P9_LE, PIX_FMT_YUV444P9LE}, - {IMGFMT_444P9_BE, PIX_FMT_YUV444P9BE}, + {IMGFMT_YUY2, AV_PIX_FMT_YUYV422}, + {IMGFMT_UYVY, AV_PIX_FMT_UYVY422}, + {IMGFMT_NV12, AV_PIX_FMT_NV12}, + {IMGFMT_NV21, AV_PIX_FMT_NV21}, + {IMGFMT_Y800, AV_PIX_FMT_GRAY8}, + {IMGFMT_Y8, AV_PIX_FMT_GRAY8}, + {IMGFMT_YVU9, AV_PIX_FMT_YUV410P}, + {IMGFMT_IF09, AV_PIX_FMT_YUV410P}, + {IMGFMT_YV12, AV_PIX_FMT_YUV420P}, + {IMGFMT_I420, AV_PIX_FMT_YUV420P}, + {IMGFMT_IYUV, AV_PIX_FMT_YUV420P}, + {IMGFMT_411P, AV_PIX_FMT_YUV411P}, + {IMGFMT_422P, AV_PIX_FMT_YUV422P}, + {IMGFMT_444P, AV_PIX_FMT_YUV444P}, + {IMGFMT_440P, AV_PIX_FMT_YUV440P}, + + {IMGFMT_420A, AV_PIX_FMT_YUVA420P}, + + {IMGFMT_420P16_LE, AV_PIX_FMT_YUV420P16LE}, + {IMGFMT_420P16_BE, AV_PIX_FMT_YUV420P16BE}, + {IMGFMT_420P10_LE, AV_PIX_FMT_YUV420P10LE}, + {IMGFMT_420P10_BE, AV_PIX_FMT_YUV420P10BE}, + {IMGFMT_420P9_LE, AV_PIX_FMT_YUV420P9LE}, + {IMGFMT_420P9_BE, AV_PIX_FMT_YUV420P9BE}, + {IMGFMT_422P16_LE, AV_PIX_FMT_YUV422P16LE}, + {IMGFMT_422P16_BE, AV_PIX_FMT_YUV422P16BE}, + {IMGFMT_422P10_LE, AV_PIX_FMT_YUV422P10LE}, + {IMGFMT_422P10_BE, AV_PIX_FMT_YUV422P10BE}, + {IMGFMT_422P9_LE, AV_PIX_FMT_YUV422P9LE}, + {IMGFMT_422P9_BE, AV_PIX_FMT_YUV422P9BE}, + {IMGFMT_444P16_LE, AV_PIX_FMT_YUV444P16LE}, + {IMGFMT_444P16_BE, AV_PIX_FMT_YUV444P16BE}, + {IMGFMT_444P10_LE, AV_PIX_FMT_YUV444P10LE}, + {IMGFMT_444P10_BE, AV_PIX_FMT_YUV444P10BE}, + {IMGFMT_444P9_LE, AV_PIX_FMT_YUV444P9LE}, + {IMGFMT_444P9_BE, AV_PIX_FMT_YUV444P9BE}, // YUVJ are YUV formats that use the full Y range and not just // 16 - 235 (see colorspaces.txt). // Currently they are all treated the same way. - {IMGFMT_YV12, PIX_FMT_YUVJ420P}, - {IMGFMT_422P, PIX_FMT_YUVJ422P}, - {IMGFMT_444P, PIX_FMT_YUVJ444P}, - {IMGFMT_440P, PIX_FMT_YUVJ440P}, - - {IMGFMT_XVMC_MOCO_MPEG2, PIX_FMT_XVMC_MPEG2_MC}, - {IMGFMT_XVMC_IDCT_MPEG2, PIX_FMT_XVMC_MPEG2_IDCT}, - {IMGFMT_VDPAU_MPEG1, PIX_FMT_VDPAU_MPEG1}, - {IMGFMT_VDPAU_MPEG2, PIX_FMT_VDPAU_MPEG2}, - {IMGFMT_VDPAU_H264, PIX_FMT_VDPAU_H264}, - {IMGFMT_VDPAU_WMV3, PIX_FMT_VDPAU_WMV3}, - {IMGFMT_VDPAU_VC1, PIX_FMT_VDPAU_VC1}, - {IMGFMT_VDPAU_MPEG4, PIX_FMT_VDPAU_MPEG4}, - {0, PIX_FMT_NONE} + {IMGFMT_YV12, AV_PIX_FMT_YUVJ420P}, + {IMGFMT_422P, AV_PIX_FMT_YUVJ422P}, + {IMGFMT_444P, AV_PIX_FMT_YUVJ444P}, + {IMGFMT_440P, AV_PIX_FMT_YUVJ440P}, + + {IMGFMT_XVMC_MOCO_MPEG2, AV_PIX_FMT_XVMC_MPEG2_MC}, + {IMGFMT_XVMC_IDCT_MPEG2, AV_PIX_FMT_XVMC_MPEG2_IDCT}, + {IMGFMT_VDPAU_MPEG1, AV_PIX_FMT_VDPAU_MPEG1}, + {IMGFMT_VDPAU_MPEG2, AV_PIX_FMT_VDPAU_MPEG2}, + {IMGFMT_VDPAU_H264, AV_PIX_FMT_VDPAU_H264}, + {IMGFMT_VDPAU_WMV3, AV_PIX_FMT_VDPAU_WMV3}, + {IMGFMT_VDPAU_VC1, AV_PIX_FMT_VDPAU_VC1}, + {IMGFMT_VDPAU_MPEG4, AV_PIX_FMT_VDPAU_MPEG4}, + {0, AV_PIX_FMT_NONE} }; -enum PixelFormat imgfmt2pixfmt(int fmt) +enum AVPixelFormat imgfmt2pixfmt(int fmt) { int i; - enum PixelFormat pix_fmt; + enum AVPixelFormat pix_fmt; for (i = 0; conversion_map[i].fmt; i++) if (conversion_map[i].fmt == fmt) break; pix_fmt = conversion_map[i].pix_fmt; - if (pix_fmt == PIX_FMT_NONE) + if (pix_fmt == AV_PIX_FMT_NONE) mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported format %s\n", vo_format_name(fmt)); return pix_fmt; } -int pixfmt2imgfmt(enum PixelFormat pix_fmt) +int pixfmt2imgfmt(enum AVPixelFormat pix_fmt) { int i; int fmt; - for (i = 0; conversion_map[i].pix_fmt != PIX_FMT_NONE; i++) + for (i = 0; conversion_map[i].pix_fmt != AV_PIX_FMT_NONE; i++) if (conversion_map[i].pix_fmt == pix_fmt) break; fmt = conversion_map[i].fmt; if (!fmt) - mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported PixelFormat %i\n", pix_fmt); + mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported AVPixelFormat %i\n", pix_fmt); return fmt; } diff -urN MPlayer-1.1.orig//fmt-conversion.h MPlayer-1.1/fmt-conversion.h --- MPlayer-1.1.orig//fmt-conversion.h 2011-03-01 22:44:15.000000000 +0100 +++ MPlayer-1.1/fmt-conversion.h 2013-01-17 09:28:38.120215759 +0100 @@ -23,8 +23,8 @@ #include "libavutil/avutil.h" #include "libavutil/samplefmt.h" -enum PixelFormat imgfmt2pixfmt(int fmt); -int pixfmt2imgfmt(enum PixelFormat pix_fmt); +enum AVPixelFormat imgfmt2pixfmt(int fmt); +int pixfmt2imgfmt(enum AVPixelFormat pix_fmt); enum AVSampleFormat affmt2samplefmt(int fmt); int samplefmt2affmt(enum AVSampleFormat sample_fmt); diff -urN MPlayer-1.1.orig//libaf/af_format.c MPlayer-1.1/libaf/af_format.c --- MPlayer-1.1.orig//libaf/af_format.c 2011-10-26 17:12:35.000000000 +0200 +++ MPlayer-1.1/libaf/af_format.c 2013-01-17 09:43:32.770183189 +0100 @@ -34,6 +34,7 @@ #include "libvo/fastmemcpy.h" #include "libavutil/avutil.h" +#include "libavutil/common.h" /* Functions used by play to convert the input audio to the correct format */ diff -urN MPlayer-1.1.orig//libaf/af_lavcac3enc.c MPlayer-1.1/libaf/af_lavcac3enc.c --- MPlayer-1.1.orig//libaf/af_lavcac3enc.c 2012-02-19 16:21:23.000000000 +0100 +++ MPlayer-1.1/libaf/af_lavcac3enc.c 2013-01-17 09:44:27.103181211 +0100 @@ -32,6 +32,7 @@ #include "reorder_ch.h" #include "av_helpers.h" +#include "libavutil/common.h" #include "libavcodec/avcodec.h" #include "libavutil/intreadwrite.h" diff -urN MPlayer-1.1.orig//libmpcodecs/vf.c MPlayer-1.1/libmpcodecs/vf.c --- MPlayer-1.1.orig//libmpcodecs/vf.c 2012-05-30 23:08:05.000000000 +0200 +++ MPlayer-1.1/libmpcodecs/vf.c 2013-01-17 09:50:25.861168154 +0100 @@ -40,6 +40,7 @@ #include "vf.h" #include "libvo/fastmemcpy.h" +#include "libavutil/common.h" #include "libavutil/mem.h" extern const vf_info_t vf_info_1bpp; diff -urN MPlayer-1.1.orig//libmpcodecs/vf_geq.c MPlayer-1.1/libmpcodecs/vf_geq.c --- MPlayer-1.1.orig//libmpcodecs/vf_geq.c 2011-04-19 09:32:36.000000000 +0200 +++ MPlayer-1.1/libmpcodecs/vf_geq.c 2013-01-17 09:44:01.045182161 +0100 @@ -34,6 +34,8 @@ #include "libavcodec/avcodec.h" #include "libavutil/eval.h" +#include "libavutil/common.h" +#include "libavutil/mem.h" struct vf_priv_s { AVExpr * e[3]; diff -urN MPlayer-1.1.orig//libmpcodecs/vf_gradfun.c MPlayer-1.1/libmpcodecs/vf_gradfun.c --- MPlayer-1.1.orig//libmpcodecs/vf_gradfun.c 2010-04-06 11:46:47.000000000 +0200 +++ MPlayer-1.1/libmpcodecs/vf_gradfun.c 2013-01-17 09:47:10.679175257 +0100 @@ -39,6 +39,7 @@ #include "vf.h" #include "libvo/fastmemcpy.h" #include "libavutil/avutil.h" +#include "libavutil/common.h" #include "libavutil/x86_cpu.h" struct vf_priv_s { diff -urN MPlayer-1.1.orig//libmpcodecs/vf_sab.c MPlayer-1.1/libmpcodecs/vf_sab.c --- MPlayer-1.1.orig//libmpcodecs/vf_sab.c 2011-05-25 15:46:32.000000000 +0200 +++ MPlayer-1.1/libmpcodecs/vf_sab.c 2013-01-17 09:28:59.964214957 +0100 @@ -32,6 +32,7 @@ #endif #include "libavutil/avutil.h" +#include "libavutil/mem.h" #include "img_format.h" #include "mp_image.h" #include "vf.h" diff -urN MPlayer-1.1.orig//libmpcodecs/vf_screenshot.c MPlayer-1.1/libmpcodecs/vf_screenshot.c --- MPlayer-1.1.orig//libmpcodecs/vf_screenshot.c 2012-02-19 23:09:30.000000000 +0100 +++ MPlayer-1.1/libmpcodecs/vf_screenshot.c 2013-01-17 09:28:04.643216971 +0100 @@ -39,6 +39,7 @@ #include "libswscale/swscale.h" #include "libavcodec/avcodec.h" +#include "libavutil/mem.h" struct vf_priv_s { int frameno; diff -urN MPlayer-1.1.orig//libmpdemux/demux_lavf.c MPlayer-1.1/libmpdemux/demux_lavf.c --- MPlayer-1.1.orig//libmpdemux/demux_lavf.c 2012-04-07 22:08:53.000000000 +0200 +++ MPlayer-1.1/libmpdemux/demux_lavf.c 2013-01-17 09:41:44.880187116 +0100 @@ -317,20 +317,20 @@ sh_audio->samplerate= codec->sample_rate; sh_audio->i_bps= codec->bit_rate/8; switch (codec->codec_id) { - case CODEC_ID_PCM_S8: - case CODEC_ID_PCM_U8: + case AV_CODEC_ID_PCM_S8: + case AV_CODEC_ID_PCM_U8: sh_audio->samplesize = 1; break; - case CODEC_ID_PCM_S16LE: - case CODEC_ID_PCM_S16BE: - case CODEC_ID_PCM_U16LE: - case CODEC_ID_PCM_U16BE: + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_U16LE: + case AV_CODEC_ID_PCM_U16BE: sh_audio->samplesize = 2; break; - case CODEC_ID_PCM_ALAW: + case AV_CODEC_ID_PCM_ALAW: sh_audio->format = 0x6; break; - case CODEC_ID_PCM_MULAW: + case AV_CODEC_ID_PCM_MULAW: sh_audio->format = 0x7; break; } @@ -358,7 +358,7 @@ priv->vstreams[priv->video_streams] = i; bih=calloc(sizeof(*bih) + codec->extradata_size,1); - if(codec->codec_id == CODEC_ID_RAWVIDEO) { + if(codec->codec_id == AV_CODEC_ID_RAWVIDEO) { switch (codec->pix_fmt) { case PIX_FMT_RGB24: codec->codec_tag= MKTAG(24, 'B', 'G', 'R'); @@ -423,24 +423,24 @@ case AVMEDIA_TYPE_SUBTITLE:{ sh_sub_t* sh_sub; char type; - if(codec->codec_id == CODEC_ID_TEXT) + if(codec->codec_id == AV_CODEC_ID_TEXT) type = 't'; - else if(codec->codec_id == CODEC_ID_MOV_TEXT) + else if(codec->codec_id == AV_CODEC_ID_MOV_TEXT) type = 'm'; - else if(codec->codec_id == CODEC_ID_SSA) + else if(codec->codec_id == AV_CODEC_ID_SSA) type = 'a'; - else if(codec->codec_id == CODEC_ID_DVD_SUBTITLE) + else if(codec->codec_id == AV_CODEC_ID_DVD_SUBTITLE) type = 'v'; - else if(codec->codec_id == CODEC_ID_XSUB) + else if(codec->codec_id == AV_CODEC_ID_XSUB) type = 'x'; - else if(codec->codec_id == CODEC_ID_DVB_SUBTITLE) + else if(codec->codec_id == AV_CODEC_ID_DVB_SUBTITLE) type = 'b'; - else if(codec->codec_id == CODEC_ID_DVB_TELETEXT) + else if(codec->codec_id == AV_CODEC_ID_DVB_TELETEXT) type = 'd'; - else if(codec->codec_id == CODEC_ID_HDMV_PGS_SUBTITLE) + else if(codec->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE) type = 'p'; -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 14, 100) - else if(codec->codec_id == CODEC_ID_EIA_608) +#if 0 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 14, 100) + else if(codec->codec_id == AV_CODEC_ID_EIA_608) type = 'c'; #endif else if(codec->codec_tag == MKTAG('c', '6', '0', '8')) @@ -465,7 +465,7 @@ break; } case AVMEDIA_TYPE_ATTACHMENT:{ - if (st->codec->codec_id == CODEC_ID_TTF) { + if (st->codec->codec_id == AV_CODEC_ID_TTF) { AVDictionaryEntry *fnametag = av_dict_get(st->metadata, "filename", NULL, 0); demuxer_add_attachment(demuxer, fnametag ? fnametag->value : NULL, "application/x-truetype-font", @@ -808,7 +808,7 @@ prog->aid = program->stream_index[i]; break; case AVMEDIA_TYPE_SUBTITLE: - if(prog->sid == -2 && priv->avfc->streams[program->stream_index[i]]->codec->codec_id == CODEC_ID_TEXT) + if(prog->sid == -2 && priv->avfc->streams[program->stream_index[i]]->codec->codec_id == AV_CODEC_ID_TEXT) prog->sid = program->stream_index[i]; break; } diff -urN MPlayer-1.1.orig//stream/cache2.c MPlayer-1.1/stream/cache2.c --- MPlayer-1.1.orig//stream/cache2.c 2012-03-04 16:11:50.000000000 +0100 +++ MPlayer-1.1/stream/cache2.c 2013-01-17 09:30:01.501212718 +0100 @@ -40,6 +40,7 @@ #include #include "libavutil/avutil.h" +#include "libavutil/common.h" #include "osdep/shmem.h" #include "osdep/timer.h" #if defined(__MINGW32__) diff -urN MPlayer-1.1.orig//sub/spudec.c MPlayer-1.1/sub/spudec.c --- MPlayer-1.1.orig//sub/spudec.c 2012-04-23 20:39:16.000000000 +0200 +++ MPlayer-1.1/sub/spudec.c 2013-01-17 09:46:50.054176009 +0100 @@ -42,6 +42,7 @@ #include "spudec.h" #include "vobsub.h" #include "libavutil/avutil.h" +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libswscale/swscale.h" diff -urN MPlayer-1.1.orig//sub/sub_cc.c MPlayer-1.1/sub/sub_cc.c --- MPlayer-1.1.orig//sub/sub_cc.c 2012-04-07 22:08:53.000000000 +0200 +++ MPlayer-1.1/sub/sub_cc.c 2013-01-17 09:46:31.413176687 +0100 @@ -42,6 +42,7 @@ #include "sub.h" #include "libavutil/avutil.h" +#include "libavutil/common.h" #define CC_MAX_LINE_LENGTH 64 debian/patches/series0000644000000000000000000000031713350150352012030 0ustar 23mplayer-debug-printf.patch 50_Hurd_PATH_MAX.patch 60-codecid.patch 61-ffmpeg.patch 62-libav-0.8.patch 62-libav-9.patch 64-planaraudio.patch 65-fix-x86-asm-includes.patch aarch64.patch CVE-2016-4352.patch debian/patches/60-codecid.patch0000644000000000000000000000106012304130640013441 0ustar r35075 | iive | 2012-08-11 12:42:43 -0400 (Sat, 11 Aug 2012) | 4 lines Quick Build Fix. FFmpeg CodecID is redefined as AVCodecID. It needs the FFmpeg includes in all places that use it. --- a/libmpdemux/mp_taglists.h (revision 35074) +++ b/libmpdemux/mp_taglists.h (revision 35075) @@ -20,6 +20,8 @@ #define MPLAYER_MP_TAGLISTS_H #include +#include "libavutil/common.h" +#include "libavformat/avformat.h" enum CodecID mp_tag2codec_id(uint32_t tag, int audio); uint32_t mp_codec_id2tag(enum CodecID codec_id, uint32_t old_tag, int audio); debian/patches/aarch64.patch0000644000000000000000000000127312313022174013064 0ustar Description: Minimal build support for arm64 Author: Colin Watson Forwarded: no Last-Update: 2014-03-21 Index: b/configure =================================================================== --- a/configure +++ b/configure @@ -1519,6 +1519,7 @@ alpha) host_arch=alpha ;; sun4*|sparc*) host_arch=sparc ;; parisc*|hppa*|9000*) host_arch=hppa ;; + aarch64*) host_arch=aarch64 ;; arm*|zaurus|cats) host_arch=arm ;; sh3|sh4|sh4a) host_arch=sh ;; s390) host_arch=s390 ;; @@ -2261,6 +2262,11 @@ _optimizing="$proc" ;; + aarch64*) + arch='aarch64' + iproc='aarch64' + ;; + arm*) arch='arm' iproc='arm' debian/patches/CVE-2016-4352.patch0000644000000000000000000000211113350163377013237 0ustar Backport of: From bcaaa044465fbc61a2ded914f53b7396695e593f Mon Sep 17 00:00:00 2001 From: rtogni Date: Thu, 28 Apr 2016 21:32:40 +0000 Subject: [PATCH] Validate image size in demux_gif Fixes crash with -vo null and overflow.gif Reported by Gustavo Grieco Closes trac #2295 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@37857 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_gif.c | 11 +++++++++++ 1 file changed, 11 insertions(+) --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c @@ -265,6 +265,17 @@ static demuxer_t* demux_open_gif(demuxer return NULL; } + // Validate image size, most code in this demuxer assumes w*h <= INT_MAX + if ((int64_t)gif->SWidth * gif->SHeight > INT_MAX) { + mp_msg(MSGT_DEMUX, MSGL_ERR, + "[demux_gif] Unsupported picture size %dx%d.\n", gif->SWidth, + gif->SHeight); + if (DGifCloseFile(gif) == GIF_ERROR) + PrintGifError(); + free(priv); + return NULL; + } + // create a new video stream header sh_video = new_sh_video(demuxer, 0); debian/patches/61-ffmpeg.patch0000644000000000000000000000265412304130640013326 0ustar Let it build with ffmpeg 0.10.3. Index: MPlayer-1.1/fmt-conversion.c =================================================================== --- MPlayer-1.1.orig/fmt-conversion.c +++ MPlayer-1.1/fmt-conversion.c @@ -65,9 +65,13 @@ static const struct { {IMGFMT_RGBA, PIX_FMT_RGB0}, {IMGFMT_RGB64LE, PIX_FMT_RGBA64LE}, {IMGFMT_RGB64BE, PIX_FMT_RGBA64BE}, +#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 50, 0) {IMGFMT_422A, PIX_FMT_YUVA422P}, +#endif +#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 35, 101) {IMGFMT_444A, PIX_FMT_YUVA444P}, #endif +#endif #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1) {IMGFMT_GBR24P, PIX_FMT_GBRP}, #endif Index: MPlayer-1.1/libmpdemux/mp_taglists.c =================================================================== --- MPlayer-1.1.orig/libmpdemux/mp_taglists.c +++ MPlayer-1.1/libmpdemux/mp_taglists.c @@ -125,7 +125,9 @@ static const struct AVCodecTag mp_bmp_ta { CODEC_ID_BMV_VIDEO, MKTAG('B', 'M', 'V', 'V')}, { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')}, { CODEC_ID_CDGRAPHICS, MKTAG('C', 'D', 'G', 'R')}, +#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(54,1,0) { CODEC_ID_CDXL, MKTAG('C', 'D', 'X', 'L')}, +#endif { CODEC_ID_CMV, MKTAG('M', 'V', 'I', 'f')}, { CODEC_ID_DFA, MKTAG('C', 'D', 'F', 'A')}, { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n')}, debian/patches/23mplayer-debug-printf.patch0000644000000000000000000000136412304130640016035 0ustar From: Reinhard Tartler Subject: in case of crash, suggest installing package mplayer-dbg for debugging symbols Forwarded: not-needed --- a/mplayer.c +++ b/mplayer.c @@ -826,6 +826,10 @@ static void exit_sighandler(int x) mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGSEGV_SIGFPE); default: mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGCRASH); + mp_msg(MSGT_CPLAYER,MSGL_FATAL, + " [ This binary of MPlayer in Debian is currently compiled with\n" + " '--enable-debug'; the debugging symbols are in the package\n" + " 'mplayer-dbg'.]\n"); #ifdef CONFIG_CRASH_DEBUG if (crash_debug) { int gdb_pid; debian/patches/65-fix-x86-asm-includes.patch0000644000000000000000000001273012304130640015655 0ustar Description: Fix includes to libavutil/x86/asm.h Author: Reinhard Tartler Forwarded: no --- mplayer-1.1+dfsg1.orig/cpudetect.c +++ mplayer-1.1+dfsg1/cpudetect.c @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "config.h" #include "cpudetect.h" #include "mp_msg.h" --- mplayer-1.1+dfsg1.orig/libmpcodecs/pullup.c +++ mplayer-1.1+dfsg1/libmpcodecs/pullup.c @@ -20,7 +20,7 @@ #include #include -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "config.h" #include "pullup.h" --- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_yadif.c +++ mplayer-1.1+dfsg1/libmpcodecs/vf_yadif.c @@ -34,7 +34,7 @@ #include "libmpdemux/demuxer.h" #include "libvo/fastmemcpy.h" #include "libavutil/common.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" //===========================================================================// --- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_filmdint.c +++ mplayer-1.1+dfsg1/libmpcodecs/vf_filmdint.c @@ -30,7 +30,7 @@ #include "vd.h" #include "vf.h" #include "cmmx.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libvo/fastmemcpy.h" #define NUM_STORED 4 --- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_ilpack.c +++ mplayer-1.1+dfsg1/libmpcodecs/vf_ilpack.c @@ -29,7 +29,7 @@ #include "mp_image.h" #include "vf.h" #include "libavutil/attributes.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" typedef void (pack_func_t)(unsigned char *dst, unsigned char *y, unsigned char *u, unsigned char *v, int w, int us, int vs); --- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_ivtc.c +++ mplayer-1.1+dfsg1/libmpcodecs/vf_ivtc.c @@ -27,7 +27,7 @@ #include "img_format.h" #include "mp_image.h" #include "vf.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libvo/fastmemcpy.h" --- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_fspp.c +++ mplayer-1.1+dfsg1/libmpcodecs/vf_fspp.c @@ -51,7 +51,7 @@ #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" --- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_noise.c +++ mplayer-1.1+dfsg1/libmpcodecs/vf_noise.c @@ -37,7 +37,7 @@ #include "vf.h" #include "libvo/fastmemcpy.h" #include "libavutil/mem.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #define MAX_NOISE 4096 #define MAX_SHIFT 1024 --- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_divtc.c +++ mplayer-1.1+dfsg1/libmpcodecs/vf_divtc.c @@ -26,7 +26,7 @@ #include "mp_msg.h" #include "cpudetect.h" #include "libavutil/common.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "mpbswap.h" #include "img_format.h" --- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_tfields.c +++ mplayer-1.1+dfsg1/libmpcodecs/vf_tfields.c @@ -27,7 +27,7 @@ #include "img_format.h" #include "mp_image.h" #include "vf.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libmpdemux/demuxer.h" #include "libvo/fastmemcpy.h" --- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_decimate.c +++ mplayer-1.1+dfsg1/libmpcodecs/vf_decimate.c @@ -27,7 +27,7 @@ #include "img_format.h" #include "mp_image.h" #include "vf.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libvo/fastmemcpy.h" --- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_gradfun.c +++ mplayer-1.1+dfsg1/libmpcodecs/vf_gradfun.c @@ -40,7 +40,7 @@ #include "libvo/fastmemcpy.h" #include "libavutil/avutil.h" #include "libavutil/common.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" struct vf_priv_s { int thresh; --- mplayer-1.1+dfsg1.orig/mp3lib/dct64_3dnow.c +++ mplayer-1.1+dfsg1/mp3lib/dct64_3dnow.c @@ -11,7 +11,7 @@ #include "config.h" #include "mangle.h" #include "mpg123.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" static unsigned long long int attribute_used __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL; static float attribute_used plus_1f = 1.0; --- mplayer-1.1+dfsg1.orig/mp3lib/dct64_mmx.c +++ mplayer-1.1+dfsg1/mp3lib/dct64_mmx.c @@ -6,7 +6,7 @@ #include "config.h" #include "mangle.h" #include "mpg123.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" void dct64_MMX(short *a,short *b,real *c) { --- mplayer-1.1+dfsg1.orig/mp3lib/dct36_3dnow.c +++ mplayer-1.1+dfsg1/mp3lib/dct36_3dnow.c @@ -30,7 +30,7 @@ #include "config.h" #include "mangle.h" #include "mpg123.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #ifdef DCT36_OPTIMIZE_FOR_K7 void dct36_3dnowex(real *inbuf, real *o1, --- mplayer-1.1+dfsg1.orig/mp3lib/dct64_k7.c +++ mplayer-1.1+dfsg1/mp3lib/dct64_k7.c @@ -11,7 +11,7 @@ #include "config.h" #include "mangle.h" #include "mpg123.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" static unsigned long long int attribute_used __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL; static float attribute_used plus_1f = 1.0; --- mplayer-1.1+dfsg1.orig/libvo/aclib_template.c +++ mplayer-1.1+dfsg1/libvo/aclib_template.c @@ -80,7 +80,7 @@ If you have questions please contact wit // 3dnow memcpy support from kernel 2.4.2 // by Pontscho/fresh!mindworkz -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #undef HAVE_ONLY_MMX1 #if HAVE_MMX && !HAVE_MMX2 && !HAVE_AMD3DNOW && !HAVE_SSE debian/patches/64-planaraudio.patch0000644000000000000000000001120112304130640014350 0ustar ------------------------------------------------------------------------ r35228 | cigaes | 2012-10-04 15:04:42 -0300 (Thu, 04 Oct 2012) | 5 lines ad_ffmpeg: basic support for planar formats. Upgrade to avcodec_decode_audio4(). Planar formats are immediately converted to packet formats. A lot of optimizations are still possible. ------------------------------------------------------------------------ --- a/libmpcodecs/ad_ffmpeg.c (revision 35227) +++ b/libmpcodecs/ad_ffmpeg.c (revision 35228) @@ -57,7 +57,7 @@ { int broken_srate = 0; int samplerate = lavc_context->sample_rate; - int sample_format = samplefmt2affmt(lavc_context->sample_fmt); + int sample_format = samplefmt2affmt(av_get_packed_sample_fmt(lavc_context->sample_fmt)); if (!sample_format) sample_format = sh_audio->sample_format; if(sh_audio->wf){ @@ -169,10 +169,10 @@ sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; switch (lavc_context->sample_fmt) { - case AV_SAMPLE_FMT_U8: - case AV_SAMPLE_FMT_S16: - case AV_SAMPLE_FMT_S32: - case AV_SAMPLE_FMT_FLT: + case AV_SAMPLE_FMT_U8: case AV_SAMPLE_FMT_U8P: + case AV_SAMPLE_FMT_S16: case AV_SAMPLE_FMT_S16P: + case AV_SAMPLE_FMT_S32: case AV_SAMPLE_FMT_S32P: + case AV_SAMPLE_FMT_FLT: case AV_SAMPLE_FMT_FLTP: break; default: return 0; @@ -202,10 +202,68 @@ return CONTROL_UNKNOWN; } +static av_always_inline void copy_samples_planar(unsigned bps, + unsigned nb_samples, + unsigned nb_channels, + unsigned char *dst, + unsigned char **src) +{ + unsigned s, c, o = 0; + + for (s = 0; s < nb_samples; s++) { + for (c = 0; c < nb_channels; c++) { + memcpy(dst, src[c] + o, bps); + dst += bps; + } + o += bps; + } +} + +static int copy_samples(AVCodecContext *avc, AVFrame *frame, + unsigned char *buf, int max_size) +{ + int channels = avc->channels; + int sample_size = av_get_bytes_per_sample(avc->sample_fmt); + int size = channels * sample_size * frame->nb_samples; + + if (size > max_size) { + av_log(avc, AV_LOG_ERROR, + "Buffer overflow while decoding a single frame\n"); + return AVERROR(EINVAL); /* same as avcodec_decode_audio3 */ + } + /* TODO reorder channels at the same time */ + if (av_sample_fmt_is_planar(avc->sample_fmt)) { + switch (sample_size) { + case 1: + copy_samples_planar(1, frame->nb_samples, channels, + buf, frame->extended_data); + break; + case 2: + copy_samples_planar(2, frame->nb_samples, channels, + buf, frame->extended_data); + break; + case 4: + copy_samples_planar(4, frame->nb_samples, channels, + buf, frame->extended_data); + default: + copy_samples_planar(sample_size, frame->nb_samples, channels, + buf, frame->extended_data); + } + } else { + memcpy(buf, frame->data[0], size); + } + return size; +} + static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) { unsigned char *start=NULL; - int y,len=-1; + int y,len=-1, got_frame; + AVFrame *frame = avcodec_alloc_frame(); + + if (!frame) + return AVERROR(ENOMEM); + while(lenpts = pts; sh_audio->pts_bytes = 0; } - y=avcodec_decode_audio3(sh_audio->context,(int16_t*)buf,&len2,&pkt); + y=avcodec_decode_audio4(sh_audio->context, frame, &got_frame, &pkt); //printf("return:%d samples_out:%d bitstream_in:%d sample_sum:%d\n", y, len2, x, len); fflush(stdout); // LATM may need many packets to find mux info if (y == AVERROR(EAGAIN)) @@ -238,6 +296,11 @@ if(y<0){ mp_msg(MSGT_DECAUDIO,MSGL_V,"lavc_audio: error\n");break; } if(!sh_audio->parser && yds->buffer_pos+=y-x; // put back data (HACK!) + if (!got_frame) + continue; + len2 = copy_samples(sh_audio->context, frame, buf, maxlen); + if (len2 < 0) + return len2; if(len2>0){ if (((AVCodecContext *)sh_audio->context)->channels >= 5) { int samplesize = av_get_bytes_per_sample(((AVCodecContext *) @@ -258,5 +321,7 @@ if (setup_format(sh_audio, sh_audio->context)) break; } + + av_free(frame); return len; } debian/mplayer-doc.doc-base.es0000644000000000000000000000062212304130614013401 0ustar Document: mplayer-es Title: MPlayer documentation (Spanish) Author: The MPlayer team Abstract: This documentation describes the use of MPlayer. (Spanish) MPlayer is a movie player for GNU/Linux that supports a wide range of audio and video formats, and output drivers. Section: Sound Format: HTML Index: /usr/share/doc/mplayer-doc/HTML/es/index.html Files: /usr/share/doc/mplayer-doc/HTML/es/*.html debian/gbp.conf0000644000000000000000000000026212304130640010576 0ustar [DEFAULT] upstream-branch = upstream debian-branch = master.experimental upstream-tag = upstream/%(version)s debian-tag = debian/%(version)s pristine-tar = True compression = xz debian/control0000644000000000000000000001206212304133334010566 0ustar Source: mplayer Section: video Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian multimedia packages maintainers Uploaders: A Mennucc1 , Reinhard Tartler Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-multimedia/mplayer.git Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/mplayer.git;a=summary Homepage: http://www.mplayerhq.hu/ Build-Depends: debhelper (>= 7), docbook-xml, docbook-xsl, ladspa-sdk, libaa1-dev, libasound2-dev [linux-any], libaudio-dev, libavcodec-dev (>= 6:9~), libavdevice-dev (>= 6:9~), libavformat-dev (>= 6:9~), libavutil-dev (>= 6:9~), libbluray-dev, libcaca-dev, libcdparanoia-dev [!hurd-i386] | libcdparanoia0-dev [!hurd-i386], libdirectfb-dev, libdts-dev, libdvdnav-dev, libdvdread-dev, libenca-dev, libesd0-dev, libfaad-dev, libfontconfig1-dev, libfreetype6-dev, libfribidi-dev, libgif-dev, libgl1-mesa-dev, libgtk2.0-dev, libjack-dev, libjpeg-dev, liblircclient-dev, liblivemedia-dev, liblzo2-dev, libmp3lame-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libopenal-dev, libpng12-dev | libpng-dev, libpostproc-dev (>= 6:0.git20120821), libpulse-dev, libschroedinger-dev, libsdl1.2-dev | libsdl1.1-dev, libsmbclient-dev, libspeex-dev, libsvga1-dev [i386 amd64], libswscale-dev (>= 6:9~), libtheora-dev (>= 1.0~beta1), libvdpau-dev [i386 amd64], libvorbis-dev, libvorbisidec-dev, libx11-dev, libx264-dev, libxext-dev, libxinerama-dev, libxv-dev, libxvidcore-dev, libxvmc-dev, libxxf86dga-dev, libxxf86vm-dev, pkg-config, vstream-client-dev, x11proto-core-dev, xsltproc, yasm, zlib1g-dev Package: mplayer-gui Architecture: any Suggests: bzip2, fontconfig, mplayer-doc, ttf-freefont Depends: mplayer, mplayer-skin, ${misc:Depends}, ${shlibs:Depends} Replaces: mplayer (<< 2:1.0~rc3+svn20090426-2), mplayer-doc (<< 2:1.0~rc3+svn20090426-2) Description: movie player for Unix-like systems MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files, supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies. . Another big feature of MPlayer is the wide range of supported output drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, DirectFB, but also SDL. . This package includes the GUI variant of MPlayer. Package: mencoder Architecture: any Suggests: bzip2, fontconfig, mplayer-doc, ttf-freefont Depends: mplayer, ${misc:Depends}, ${shlibs:Depends} Description: MPlayer's Movie Encoder MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files, supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies. . This package contains mencoder, a simple movie encoder, designed to encode MPlayer-playable movies (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other MPlayer-playable formats. It can encode with various codecs, like DivX4 (1 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream copying and video resizing capabilities. Package: mplayer Architecture: any Suggests: bzip2, fontconfig, mplayer-doc, netselect | fping, ttf-freefont Depends: ${misc:Depends}, ${shlibs:Depends} Replaces: mencoder (<< 2:1.0~rc3+svn20090426-2), mplayer-doc (<< 2:1.0~rc3+svn20090426-2), mplayer-nogui (<< 2:1.0~rc3+svn20090426-2), mplayer2 Conflicts: mplayer2 Description: movie player for Unix-like systems MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files, supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies. . Another big feature of MPlayer is the wide range of supported output drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, DirectFB, but also SDL. . Not all of the upstream code is distributed in the source tarball. See the README.Debian and copyright files for details. Package: mplayer-dbg Architecture: any Section: debug Priority: extra Depends: mplayer (= ${binary:Version}), ${misc:Depends} Replaces: mplayer2-dbg Conflicts: mplayer2-dbg Description: debugging symbols for MPlayer This package contains the debugging symbols for MPlayer, a movie player for Unix-like systems. . This package is required if you want to generate useful debugging back-traces. Package: mplayer-doc Architecture: all Section: doc Recommends: mplayer Depends: ${misc:Depends} Replaces: mplayer (<< 2:1.0~rc3+svn20090426-1) Description: documentation for MPlayer This package contains the HTML documentation for MPlayer, a movie player for Unix-like systems. It is available in several languages. . You only need this package if you want to read the MPlayer manual. The manpages are included in the regular MPlayer package. debian/mplayer-doc.doc-base.cs0000644000000000000000000000061612304130614013402 0ustar Document: mplayer-cs Title: MPlayer documentation (Czech) Author: The MPlayer team Abstract: This documentation describes the use of MPlayer. (Czech) MPlayer is a movie player for GNU/Linux that supports a wide range of audio and video formats, and output drivers. Section: Sound Format: HTML Index: /usr/share/doc/mplayer-doc/HTML/cs/index.html Files: /usr/share/doc/mplayer-doc/HTML/cs/*.html debian/prefs/0000755000000000000000000000000012304130614010277 5ustar debian/prefs/MD5SUMS0000644000000000000000000000414112304130614011317 0ustar cb4bb06ebc804f5dc4ec0ed516dc20d9 all-20061022.tar.bz2 0407e8ad132e37ccd3f932448ca201c5 all-20071007.tar.bz2 c71cbf23c9ac84b85a15801af6fe5fa4 all-alpha-20061028.tar.bz2 7918b605cca3df7e2c34784f1328e494 all-ppc-20061022.tar.bz2 abcf4a3abc16cf88c9df7e0a77e9b941 essential-20061022.tar.bz2 4ea9c2dbd0945c83af1a8d0dd363993c essential-20071007.tar.bz2 96fe3d614650531dda6675124f986a13 essential-alpha-20061028.tar.bz2 af409ba2918dc8f639dded805102fc76 essential-amd64-20061203.tar.bz2 8e1ceeec51469f5baac65e56fac709e8 essential-amd64-20071007.tar.bz2 df9ec99d9fa7ef0ab6a633cfb421d637 essential-ppc-20061022.tar.bz2 6682d5013a91bb80fdde87a516f6a8af essential-ppc-20071007.tar.bz2 1f5b8e9d9e31f898b1207a0b3bd70f32 qt5dlls-20040626.tar.bz2 dbb2e77156a69179473b86f7498e9b29 qt63dlls-20050115.tar.bz2 9fb88417aef157e2f1f5b7be57eaed7b qt65dlls-20040704.tar.bz2 c8cc10f2c9f109fa44fc4dddb91571c4 qt6dlls-20040626.tar.bz2 a7e750afda31796d322395d77c4184d0 qtextras-20041107.tar.bz2 c9ae3969ba1e73a8cbeef38f5803fd2e rp8codecs-20040626.tar.bz2 32919658c4bdfb3454173e3d64d26dc2 rp8codecs-alpha-20050115.tar.bz2 4cc9a6270f9aa834b4fef49d71b9faf9 rp8codecs-ppc-20050115.tar.bz2 534658c867abb81c38e0c05bccc79a79 rp8codecs-win32-20040626.tar.bz2 a32f4fa1f77593536a57e4b662fde7aa rp9codecs-20050115.tar.bz2 6b56c1c127f5ac0c4c8a9878f24477ca rp9codecs-win32-20050115.tar.bz2 4558d3690e9479b06df16d0a15b35f9d unsupported-20040809.tar.bz2 90ba6a76ded2f9fd9f865024bd8de3d3 win32codecs-20040703.tar.bz2 58ce4d68001d4f39c3e84d52834fb3ef win32codecs-essential-20040703.tar.bz2 a7c980a1a94fbac6ebd34c7485a1891d xanimdlls-20040626.tar.bz2 0b4877ac52eb7e84eb3031e6d7a3f65d xanimdlls-alpha-20061028.tar.bz2 8965e5f67f39530f293fc6c594bca19a xanimdlls-ppc-20040626.tar.bz2 1e409d500336a8318cbe2a67bbf9d9ca essential-macosx-x86-20060611.zip 788cf4940280fd787c0a2141d88ce3c7 rp9codecs-macosx-20041107.pkg.zip 1323e8d46bfc7b8d1d6d172018222e9c windows-all-20061022.zip f96557eeddb4ea9d286a89ff8c91750a windows-all-20071007.zip 0cc375cebb4f7820ad82bc2802171193 windows-essential-20061022.zip e32bdc9970f0df7da8eb23d2b254b866 windows-essential-20071007.zip debian/prefs/codecs_list0000644000000000000000000000041612304130614012516 0ustar i386 @MAINSITE@ releases/codecs essential-20071007.tar.bz2 powerpc @MAINSITE@ releases/codecs essential-ppc-20071007.tar.bz2 amd64 @MAINSITE@ releases/codecs essential-amd64-20071007.tar.bz2 alpha @MAINSITE@ releases/codecs essential-alpha-20061028.tar.bz2 debian/prefs/mirrors0000644000000000000000000000035612304130614011723 0ustar http://www1.mplayerhq.hu/MPlayer/ http://www2.mplayerhq.hu/MPlayer/ http://www3.mplayerhq.hu/MPlayer/ http://www4.mplayerhq.hu/MPlayer/ http://www5.mplayerhq.hu/MPlayer/ http://www7.mplayerhq.hu/MPlayer/ http://www8.mplayerhq.hu/MPlayer/ debian/source/0000755000000000000000000000000012304130614010460 5ustar debian/source/format0000644000000000000000000000001412304130614011666 0ustar 3.0 (quilt) debian/source/options0000644000000000000000000000005212304130614012073 0ustar unapply-patches abort-on-upstream-changes debian/mplayer.preinst0000644000000000000000000000174012304130614012241 0ustar #!/bin/sh # preinst script # set -e # summary of how this script can be called: # * `install' # * `install' # * `upgrade' # * `abort-upgrade' # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package case "$1" in install) ;; upgrade) if dpkg --compare-versions "$2" le "1.0~rc3+svn20090405-1"; then md5=`md5sum /etc/mplayer/mplayer.conf | cut -d' ' -f1` case "$md5" in 9bdac8eb1184daa188d4829575ceafe8|\ 46f52a60c07ed788500056dd7ffd27b9) echo "removing obsolete /etc/mplayer/mplayer.conf" rm -f /etc/mplayer/mplayer.conf esac fi ;; abort-upgrade) ;; *) echo "preinst called with unknown argument \`$1'" >&2 exit 1 ;; esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 debian/README.Debian0000644000000000000000000000305012304130614011217 0ustar MPlayer configuration ===================== Some configuration options for the entire system will be set in the file /etc/mplayer/mplayer.conf which may be adapted later. Each user can also define private options in ~/.mplayer/config. Compliance with the GPLv2, sec 2.a ================================== The MPlayer sources contain source code from other GPL libraries, such as libavcodec from the FFMpeg project, mp3lib, liba52 and others. Please see the file debian/copyright for detailed licensing information. During the discussions on debian-legal in 2002-03, it was pointed out that MPlayer may not be respecting the following section of the GPL v2: 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. This issue is pointed out in detail in the following thread: http://lists.debian.org/debian-legal/2003/debian-legal-200301/msg00231.html Currently mplayer ships files such as libfaad2/local_changes.diff libmpeg2/libmpeg-0.4.0.diff tremor/tremor.diff to comply with this request. Moreover all changes to the code are documented in the publicly accessible SVN repository of MPlayer. A. Mennucc with adaptions by Fabian Greffrath -- Reinhard Tartler , Tue, 9 Mar 2010 18:41:50 +0100 debian/clean0000644000000000000000000000014412304130614010164 0ustar debian/postrm debian/menu debian/TODO.Debian debian/templates debian/mime debian/config debian/dirs debian/mplayer-doc.doc-base.fr0000644000000000000000000000062012304130614013377 0ustar Document: mplayer-fr Title: MPlayer documentation (French) Author: The MPlayer team Abstract: This documentation describes the use of MPlayer. (French) MPlayer is a movie player for GNU/Linux that supports a wide range of audio and video formats, and output drivers. Section: Sound Format: HTML Index: /usr/share/doc/mplayer-doc/HTML/fr/index.html Files: /usr/share/doc/mplayer-doc/HTML/fr/*.html debian/copyright0000644000000000000000000007743312304130614011131 0ustar Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173 Upstream-Name: mplayer Source: http://mplayerhq.hu Copyright: GPL-2+ Files: * Copyright: 2000-2011 The mplayer and mplayer2 Developers 1995-1999 by Michael Hipp 2006 Zuxy MENG License: GPL-2+ Files: debian/* Copyright: 2009-2011 Reinhard Tartler 2003-2009 Andrea Mennucc1 2001 TeLeNiEkO License: GPL-2+ Files: libmpeg2/* Copyright: 2000-2003 Michel Lespinasse 1999-2000 Aaron Holtzman 2003 David S. Miller 2002-2003 Falk Hueffner License: GPL-2+ Comment: Version 0.4.0b + patches, cf. http://libmpeg2.sourceforge.net/ Files: mp3lib/* Copyright: 1995 by Michael Hipp License: GPL-2+ Comment: Version: 0.59s + significant changes, cf. http://www.mpg123.de/ Files: tremor/* Copyright: 2002 Xiph.org Foundation License: Tremor Comment: Version 1.0 + parts CVS from December 2004 + patches, cf. http://xiph.org/ Files: loader/* Copyright: 1995 Alexandre Julliard 1994 Eric Youndale & Erik Bos 1996-98 Marcus Meissner 1995 Thomas Sandford 1996 Martin von Loewis 1993 Robert J. Amstadt 1995-1996 Alexandre Julliard 2000-2001 Eugene Kuznetsov (divx@euro.ru) License: GPL-2+ Comment: avifile DLL loader, Version 0.47 + patches + CVS updates, cf. http://avifile.sourceforge.net/ Files: stream/realrtsp/* Copyright: 2000-2002 the xine project License: GPL-2+ Comment: realrtsp, from xine CVS 2003/04/17 + patches, cf. http://www.xinehq.de Files: libmpdemux/genres.h Copyright: 2001 Jason Carter License: GPL-2+ Comment: id3edit, Version 1.9 + patches, cf. http://id3edit.sourceforge.net/ Files: stream/freesdp/* Copyright: 2001-2003 Federico Montesino Pouzols License: GPL-2+ Comment: FreeSDP, Version 0.4.1, cf. https://savannah.nongnu.org/projects/freesdp/ Files: libmpdemux/demux_avs.c libmpdemux/demux_avs.h Copyright: 2005 Gianluigi Tiesi 2003 Kevin Atkinson License: GPL-2+ Files: libmpdemux/yuv4mpeg.h Copyright: 2001 Matthew J. Marjanovic License: GPL-2+ Comment: mjpeg.sourceforge.net Files: ffmpeg/* Copyright: 2010 Zhentan Feng 2010 Tomas Härdin 2010 Sebastian Vater 2010 Rafael Carre 2010 Nolan Lum 2010 Mohamed Naufal Basheer 2010 Michele Orrù 2010 Michael Chinen 2010 Martin Storsjo 2010 Marcelo Galvao Povoa 2010 Laurent Aimar 2010 Josh Allmann 2010 Jason Garrett-Glaser 2010 Janne Grunau 2010, Google, Inc 2010 Francesco Lavra 2010 Eli Friedman 2010 Daniel G. Taylor 2010 Carl Eugen Hoyos 2010 Anton Khirnov 2010 Anatoly Nenashev 2010 Amanda, Y.N. Wu 2010 Alex Converse 2010 Adrian Daerr and Nicolas George 2009 Tobias Bindhammer 2009 Thomas P. Higdon 2009 Thilo Borgmann 2009 Stephen Backway 2009 Samalyse 2009 Ronald S. Bultje 2009 Nathan Caldwell 2009 Michael Tison 2009 Maxim Poliakovski 2009 Kostya Shishkov 2009 Kenan Gillet 2009 Kenan Gillet 2009 Jimmy Christensen 2009 James Darnley 2009 Ivan Schreter 2009 Dylan Yudaken 2009 Daniel Verkamp 2009 Colin McQuillan 2009 Christian Schmidt 2009 Bjorn Axelsson 2009-2010 Stefano Sabatini 2008 vmrsss 2008 Vladimir Voroshilov 2008 Victor Paesa 2008 Sisir Koppaka 2008 Robert Marston 2008 NVIDIA 2008 Jaikrishnan Menon 2008 Jaikrishnan Menon 2008 GUCAS, Zhentan Feng 2008 Alessandro Sappia 2008 Affine Systems, Inc (Michael Sullivan, Bobby Impollonia) 2008-2010 Vitor Sessak 2008-2010 Paul Kendall 2008-2010 David Conrad 2008-2010 Alexander Strange 2008-2009 Splitted-Desktop Systems 2007 Nicholas Tung 2007 Marco Gerards 2007 Marc Hoffman 2007 Luca Barbato 2007 Denes Balatoni 2007 Bobby Bingham 2007 Bjrn Axelsson 2007 Benoit Fouet ( benoit fouet free fr ) 2007 Anssi Hannula 2007-2010 Baptiste Coudurier 2007-2009 Loren Merritt 2007-2009 Bartlomiej Wolowiec 2007-2008 Siarhei Siamashka 2007-2008 Ian Caulfield 2006 Thijs Vermeir 2006 Steve Lhomme 2006 Stefan Gehrer 2006 Paul Richards 2006 Patrick Guimond 2006 Kartikey Mahendra BHATT (bhattkm at gmail dot com) 2006 Julian Hall 2006 Guillaume Poirier 2006 Expertisecentrum Digitale Media, UHasselt 2006 Daniel Maas 2006 Corey Hickey 2006 Benjamin Larsson 2006-2010 Reimar Döffinger 2006-2010 Prakash Punnoor 2006-2010 Justin Ruggles 2006-2010 Aurelien Jacobs 2006-2009 Robert Swain ( rob opendot cl ) 2006-2009 Ramiro Polla 2006-2009 Baptiste Coudurier 2006-2008 Zuxy MENG Jie, Loren Merritt 2006-2008 Ivo van Poorten 2006-2008 Gregory Montoir (cyx@users.sourceforge.net) 2006-2008 BBC, Anuradha Suraparaju 2006-2007 SmartJog S.A., Baptiste Coudurier 2006-2007 Ryan Martell 2006-2007 Reynaldo H. Verdejo Pinochet 2006, 2007 Michel Bardiaux 2006-2007 Maxim Gavrilov ( maxim.gavrilov gmail com ) 2006-2007 Luca Abeni ( lucabe72 email it ) 2005 Vidar Madsen 2005 Steve Underwood 2005 Ole Andr Vadla Ravns 2005 Matthieu CASTET, Alex Beregszaszi 2005 Luca Barbato 2005 Jeff Muizelaar 2005 BBC, Andrew Kennedy 2005 Anonymous, Alex Beregszaszi, Michael Niedermayer 2005 Alban Bedel 2005-2010 Mans Rullgard 2005-2008 Konstantin Shishkov 2005-2007 Wolfram Gloger 2005-2006 Robert Edele 2005-2006 Oded Shimon 2005-2006 DivX, Inc 2004 Maarten Daniels 2004 Gildas Bazin 2004 AGAWA Koji 2004 Adam Thayer 2004-2007 Eric Lasota 2004-2007 Denes Balatoni < dbalatoni XatX interware XdotX hu > 2004-2007 Benjamin Zores 2004-2005 Michael Niedermayer, Loren Merritt 2003 Tinic Uro 2003 Thomas Raivio 2003 Sascha Sommer 2003 Pascal Massimino 2003 Nick Kurshev 2003 Michel Bardiaux 2003 Max Krasnyansky 2003 James Klicman 2003 Ivan Kalvachev 2003 Dr. Tim Ferguson 2003 David S. Miller 2003 Daniel Moreno 2003, 2007 Mike Melanson 2003-2004 Roman Shaposhnik 2003-2004 Romain Dolbeau 2002 the xine project 2002 Steve O'Hara-Smith 2002 Remi Guyomarch ] 2002 Laszlo Torok 2002 Francois Revol 2002 Falk Hueffner 2002 Dieter Shirley 2002 by Leon van Stuivenberg 2002 Brian Foley 2002 A'rpi 2002-2009 Maxim Poliakovski 2002-2007 the ffmpeg project 2002-2006 Alex Beregszaszi 2002-2004 Roberto Togni 2002-2003 Brian J. Murrell 2001 Tim Ferguson 2001 Lionel Ulmer 2001 Juan J. Sierralta P 2001-2010 Michael Niedermayer 2001, 2006-2010 Peter Ross 2001-2003 BERO 2000 Michel Lespinasse 2000-2011 The FFmpeg developers 2000-2003 Fabrice Bellard 2000-2001 Peter Gubanov 2000-2001 Michel Lespinasse 1999 Roger Hardiman 1999 Intel Corporation 1999,2000 Sebastien Rougeaux 1994-1996, Thomas G. Lane License: LGPL-2.1+ Files: ffmpeg/ffmpeg.c ffmpeg/libavcodec/dtsdec.c ffmpeg/libavcodec/i386/idct_mmx.c ffmpeg/libavcodec/liba52/*.[ch] ffmpeg/libavformat/x11grab.c ffmpeg/libavformat/gxfenc.c ffmpeg/libpostproc/postprocess_internal.h ffmpeg/libpostproc/postprocess_altivec_template.c ffmpeg/libpostproc/postprocess.h ffmpeg/libpostproc/postprocess_template.c ffmpeg/libpostproc/postprocess.c ffmpeg/libpostproc/mangle.h ffmpeg/libswscale/swscale.c ffmpeg/libswscale/swscale-example.c ffmpeg/libswscale/yuv2rgb_template.c ffmpeg/libswscale/swscale_altivec_template.c ffmpeg/libswscale/yuv2rgb_altivec.c ffmpeg/libswscale/swscale_template.c ffmpeg/libswscale/rgb2rgb_template.c ffmpeg/libswscale/rgb2rgb.c ffmpeg/libswscale/cs_test.c ffmpeg/libswscale/yuv2rgb_mlib.c ffmpeg/libswscale/yuv2rgb.c Copyright: 2000-2011 The FFmpeg developers 2006 Clemens Fruhwirth 1999-2001 Aaron Holtzman 2000-2001 Fabrice Bellard 1997-1998 Rasca, Berlin License: GPL-2+ Files: ffmpeg/libavcodec/x86/vc1dsp_mmx.c ffmpeg/libavcodec/nellymoser.* ffmpeg/libavcodec/nellymoserdec.c ffmpeg/libavformat/oggdec.* ffmpeg/libavformat/oggparseogm.c ffmpeg/libavformat/oggparsevorbis.c Copyright: 2007 Christophe GISQUET 2007 Loic Minier , Benjamin Larsson 2005 Michael Ahlberg, Måns Rullgård License: Expat Files: mplayer/ffmpeg_files/arm/bswap.h mplayer/ffmpeg_files/sh4/bswap.h mplayer/ffmpeg_files/taglists.c mplayer/ffmpeg_files/bswap.h mplayer/ffmpeg_files/bfin/bswap.h The following has not been converted fully to dep5 yet. --- TOOLS In the TOOLS directory you can find some nice scripts and code that makes using MPlayer and MEncoder easier, for example scripts for DVD track encoding in three pass mode or creating SVCDs from a movie. MPlayer scripts in the TOOLS dir -------------------------------- edgedetect.fp, emboss.fp Author: Reimar Döffinger Description: Examples of custom fragment program for OpenGL video out driver Usage: mplayer -vo gl:yuv=4:customprog=edgedetect.fp midentify.sh Author: Tobias Diedrich Description: Runs 'mplayer -identify' for all arguments while preventing video window flashing. Usage: midentify.sh file1 [file2 ...] mpconsole.sh Author: Rich Felker Description: Script to run MPlayer on the console (fbdev/mga_vid/etc.) without the console text and/or flashing cursor getting in the way. Usage: mpconsole.sh [mplayer options] mplmult.sh Author: Reimar Döffinger Description: Example how to output video on multiple windows in sync. Might be even more useful in combination with -vo ggi to distribute the video arbitrarily. Usage: mplmult.sh n Number of MPlayer instances that display the video. options Any options you would pass to MPlayer, more than one file will usually not work. subsearch.sh Author: Alex Beregszaszi Description: Collects subtitle files from the directory given as argument ('.' if none is given) and its subdirectories and prints them as a comma separated list to stdout. Usage: subsearch.sh [directory] mplayer -sub `subsearch.sh` movie wma2ogg.pl Author: Peter Simon Description: Converts WMA files to Ogg or MP3. Usage: wma2ogg [options] <-f FILE1 | -f FILE2 ... | -a> -f, -file filename -a converts all WMA files in the current directory -t output filetype (ogg, mp3) [default=ogg] -lame I wanna use L.A.M.E. sure enough! -br bitrate (kb/s) [default=from the WMA] -del remove WMA file(s) after the transcoding MEncoder scripts in the TOOLS dir --------------------------------- divx2svcd.sh Author: Miklos Vajna Description: A simple utility that creates an SVCD from a video in an AVI container. Usage: divx2svcd.sh [options] see 'divx2svcd.sh -h' for more info mencvcd.sh Author: Jürgen Hammelmann Description: Converts DVD (or anything else that MPlayer plays) to (S)VCD Usage: mencvcd.sh [mencvcd.sh options] [mplayer options] see 'mencvcd.sh -h' for more info Note: Requires MPlayer, mjpegtools, VCDImager, cdrdao, and optionally LAME, tooLAME and SoX. dvd2divxscript.pl Author: Florian Schilhabel Description: Yet another DVD to divx helper script. This script encodes a DVD track in three pass mode to MPEG-4 with libavcodec. Optionally it writes the resulting movie file to CD-ROM the corresponding audio track to MP3. It can also shut down the computer when it finishes. If you like, you can watch the MEncoder output on /dev/tty8. Usage: --help show help --abr (AudioBitRate) Please enter the desired bitrate this can be either [96|128|192] kbit/sec (default: 128). --lang Specify the Language of the audio track this can be for example or (default: ). --dvd Specify the DVD track you want to encode. --cdsize Specify the size of your CD-ROM (default: 700MB). --shutdown Shutdown the system, when the encoding process has finished. Needs appropriate privileges. --out Specify the name of your encoded movie. The file extension will be appended automatically. --writecd Takes the newly created movie and writes it to a CD-ROM. --writedev cdrecord device identifier, for example 0,1,0 --speed writing speed (default: 4) --dvd-device device to pull the video off (default: /dev/dvd) aconvert.sh Author: Jonas Jermann Description: A hack to allow MEncoder to read respectively encode from audio only files. Usage: aconvert.sh <"input file"> <"output file"> <"options"> If no options are specified the following is assumed: -oac lavc -lavcopts acodec=mp3:abitrate=192 Note: The script is probably bash dependent and it's just a quick hack, feel free to improve it (or much better: fix MEncoder ;). qepdvcd.sh Author: Reynaldo H. Verdejo Pinochet Description: converter from any supported format to VCD/SVCD PAL/NTSC Usage: qepdvcd.sh file Run with no arguments to see the list of options. Note: You will need vcdimager/cdrecord to master/burn the resulting files. Tech scripts in the TOOLS dir ----------------------------- calcbpp.pl Author: Moritz Bunkus Description: A script that calculates the $bpp for a movie, mentioned in DOCS/tech/encoding-tips.txt, see that document for more info. Usage: calcbpp.pl resolution: the cropped but unscaled resolution (use '-vf cropdetect') aspect ratio: the encoded aspect ratio. All DVDs come at 720x576 but contain a flag that tells the player wether it should display the DVD at an aspect ratio of 4/3 (1.333) or at 16/9 (1.777). Have a look at MPlayer's output - there's something about 'prescaling'. That's what you are looking for. bitrate: the video bitrate in kbit/s fps: the fps example: calcbpp.pl 720x440 16/9 896 25 countquant.pl Author: Moritz Bunkus Description: Counts the quantizers used for the encoding, mentioned in DOCS/tech/encoding-tips.txt, see that document for more info. Usage: countquant.pl < divx2pass.log It will print out which quantizer was used how often. If you see that e.g. the lowest quantizer (vqmin=2) gets used for > 95% of the frames then you can safely increase your picture size. plotpsnr.pl Author: Jonas Jermann Description: Draw PSNR log graphs using gnuplot. Usage: plotpsnr.pl [options] -h, --help Display this help message -quant Display quantizers -size Display size -psnr Display PSNR -iframes Display I-frames -pframes Display P-frames -bframes Display B-frames -aframes Display all frames in different colors -cmp Compare two files -qs