summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'ubuntu-uploaded' into ubuntudebian/2%1.0_rc4.dfsg1-1ubuntu2ubuntuReinhard Tartler2011-02-26
|\
| * import mplayer_1.0\~rc4.dfsg1-1ubuntu1.dsc that was actually uploadeddebian/2%1.0_rc4.dfsg1-1ubuntu1Reinhard Tartler2011-02-26
* | update debian/changelogReinhard Tartler2011-02-26
* | syncronize with debianReinhard Tartler2011-02-26
* | Merge commit 'debian/2%1.0_rc4.dfsg1-1' into ubuntuReinhard Tartler2011-02-26
|\ \
| * | use gzip compressiondebian/2%1.0_rc4.dfsg1-1Reinhard Tartler2011-02-06
| * | track upstream branchReinhard Tartler2011-02-06
| * | start new uploadReinhard Tartler2011-02-06
| * | don't try to install mplayer-gui, cleanup after mergingReinhard Tartler2011-02-06
| * | merge the experimental branchReinhard Tartler2011-02-06
| |\ \
| | * | add versioned build depends for all ffmpeg packagesdebian/2%1.0_rc4_try2.dfsg1-1Reinhard Tartler2011-01-23
| | * | update debian/changelogReinhard Tartler2011-01-23
| | * | clarifications in debian/copyrightReinhard Tartler2011-01-23
| | * | remove patches that are applied upstreamReinhard Tartler2011-01-23
| | * | new upstream snapshotReinhard Tartler2011-01-23
| | * | Merge commit 'upstream/1.0.rc4.try2.dfsg1' into master.experimentalReinhard Tartler2011-01-23
| | |\ \
| | | * | Imported Upstream version 1.0~rc4~try2.dfsg1upstream/1.0.rc4.try2.dfsg1Reinhard Tartler2011-01-23
| | * | | enable joystick at compilation but leave it disable in config (Closes: #592082)steph2010-11-01
| | * | | unbreak compilation for eval.h move not yet in 0.6Reinhard Tartler2010-08-07
| * | | | clarifications in debian/copyrightReinhard Tartler2010-08-07
| * | | | update debian/changelogReinhard Tartler2010-08-07
| * | | | track upstream rc3 branchReinhard Tartler2010-08-01
| * | | | work in masterReinhard Tartler2010-08-01
| * | | | update debian/changelogReinhard Tartler2010-08-01
| * | | | Merge commit '717df26f7d9c0a2843ea8060550d3c5adb54d511'Reinhard Tartler2010-08-01
| |\ \ \ \
| | * | | | remove unwanted dvdcssupstream.rc3Reinhard Tartler2010-08-01
| * | | | | update debian/changelogReinhard Tartler2010-08-01
| * | | | | Revert "compile against internal ffmpeg for now"Reinhard Tartler2010-08-01
| * | | | | update debian/changelogReinhard Tartler2010-08-01
| * | | | | enable mencoder and mplayer-guiReinhard Tartler2010-08-01
* | | | | | enable blueray supportdebian/2%1.0_rc4_try1.dsfg1-1ubuntu2Reinhard Tartler2011-02-26
* | | | | | prepare new uploadReinhard Tartler2011-02-26
| |_|_|_|/ |/| | | |
* | | | | update deiban/changelogdebian/1.0.rc4.try1.dsfg1-1ubuntu1Reinhard Tartler2010-08-07
* | | | | really build against system FFmpegReinhard Tartler2010-08-07
* | | | | prepare debian/changelogReinhard Tartler2010-08-07
* | | | | Merge branch 'master.experimental' into ubuntuReinhard Tartler2010-08-07
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | avoid building the same source twicedebian/1.0.rc4.try1.dsfg1-1Reinhard Tartler2010-08-03
| * | | | update debian/changelogReinhard Tartler2010-08-03
| * | | | no longer build mplayer-gui, it doesn't build anymore with shared swscaleReinhard Tartler2010-08-02
| * | | | prepare new uploadReinhard Tartler2010-08-02
| * | | | enable dvdnav support, Closes: #582508, #488226, LP: #611749Reinhard Tartler2010-08-02
| * | | | sort build depends alphabeticallyReinhard Tartler2010-08-02
| * | | | enable mencoder and mplayer-guiReinhard Tartler2010-08-02
| * | | | Merge branch 'upstream' into master.experimentalReinhard Tartler2010-08-02
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | remove unwanted dvdcssReinhard Tartler2010-08-01
* | | | | update debian/changelogdebian/1.0.rc4.try1-1ubuntu1Reinhard Tartler2010-07-29
* | | | | unbreak compilation for eval.h move not yet in 0.6Reinhard Tartler2010-07-29
* | | | | ensure that patches are actually applied during buildReinhard Tartler2010-07-29
* | | | | work in 'ubuntu' branchReinhard Tartler2010-07-29
* | | | | build against system ffmpeg, enable mplayer-gui and mencoderReinhard Tartler2010-07-29