-
Committer:
Gauvain Pocentek
-
Date:
2011-04-09 15:22:31 UTC
-
mfrom:
(66.1.10 natty)
-
Revision ID:
gauvain@images-20110409152231-wz5anqddi7stsn67
* Merge from Ubuntu:
- put back faac support
- recommends apport-hooks-medibuntu
- change Maintainer, Uploaders & Vcs-* fields.
* No change upload for libx264-98 -> libx264-106 transition
* Finish Merge from debian/unstable. Remaining changes:
- Build depend on lame, x264, xvidcore and libbluray
* Merge from debian unstable. Remaining changes:
- build depend against, lame, x264, xvid
* Dropped changes, applied upstream:
- debian/patches/60eval-api.patch, backport patch from upstream to
unbreak compilation for eval.h move not yet in 0.6
* upload to unstable
* enable joystick at compilation but leave it disable in config
(Closes: #592082, LP: #617986)
* new upstream snapshot, remove patches that are applied upstream
* minor clarifications in debian/copyright
* enable libbluray support
* No change rebuild against current libx264
* prepare next upload
* upload to unstable
* enable mencoder and mplayer-gui package
* build again against the system FFmpeg 0.5
* build mplayer against internal ffmpeg to workaround interoperability
problems with FFmpeg 0.6
* prepare next upload
* upload to unstable
* enable mencoder and mplayer-gui package
* build again against the system FFmpeg 0.5