[SCM] ffmpeg/master: Merge branch 'master' into master.snapshot

[siretart at users.alioth.debian.org]

Add myself as uploader.
Single-space indent continuated lines in control file.
bump urgency
update debian/changelog
Fix several security issues in flicvideo.c
finalize debian/changelog
fix x11grab example in e.g. the manpage so that they actually work
add libxfixes-dev to build-depends to unbreak x11grab input, Closes: #596342, LP: #631103
start new upload
finalize changelog
Fix typo: use -march=armv7-a instead of -marmv7-a
merged the last two changelog entries, -3 hasn't been uploaded
Update changelog for last fix
Pass -marmv7-a for the NEON flavor if needed
Initial 4:0.5.2-4 changelog to fix a bug id
confflags: detect armv6t2 support; closes: #594093
Move breaks declaration from libavformat to libavcodec to help the apt solver, Closes: #591881
prepare new upload
update debian/changelog
bump standards version
more elaborate debian/changelog
update debian/changelog
Enable all encoders, Closes: #418231, #433287, #440216
fix debian/control file
add proper replaces for ffpresets move
fix upload target
Update debian/changelog.
Remove fix-ftbfs-altivec.patch, applied upstream.
Remove ffmpeg-debian_hurd.patch, applied upstream.
Merge commit 'upstream/0.5.2'
Imported Upstream version 0.5.2
update debian/changelog
move presets back to 'ffmpeg' package. Closes #581748
Update overrides for new libavcodec52 libraries.
Bumpt to Standards-Version 3.8.4
Fix dependency problem for ffmpeg binary package when using extra ffmpeg libs. This will still leave problem with ffmpeg-dbg, but the debug package will be useless anyway when using extra ffmpeg libs.
new upload
fix ftbfs on powerpc
finalize debian/changelog
Fix compilation on powerpc with --disable-altivec
reintroduce gnu/hurd patch
prepare new upload
bump shlibs for av_lock_mgr() addition to libavcodec
Merge remote branch 'origin/master'
update debian/changelog
drop wmapro backport again
merge changes from ubuntu packaging
use '<<' instead of '<' relationship for internal shlib file
adapt to new versioning scheme
remove patches that got merged into 0.5.1
prepare new upload
Merge commit 'upstream/0.5.1'
Imported Upstream version 0.5.1
track upstream-0.5 branch
update url
Adjust the previous changelog entry to include a lost commit.
update copyright dates
fix usage help
mark MMX runtime check backports as submitted for 0.5
update patch header for symbol versioning patch
note kfreebsd patch as forwarded
note bug as forwarded
drop debian/patches/ffmpeg-debian_hurd.patch
backport libswscale CONFIG_RUNTIME_CPUDETECT related change to libswscale
start new upload
enable cpu runtime detection
Revert "enable cpu autodetection in libswscale, Closes: #567725. LP: #386397"
backport patch from trunk for adding cpu runtime detection
update debian/changelog
enable cpu autodetection in libswscale, Closes: #567725. LP: #386397
update debian/changelog
backport wmapro codec from ffmpeg trunk
prepare new upload
document some unattributed patches
debian/patches/901-fix-misc-typos.patch: New patch taken from upstream GIT (slightly modified) to fix some spelling errors.
Document our calling of debhelper programs in an odd order in debian/rules.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d70e0b63233c5dc9d4ffa4d2481a67b9543ab5b0
X-Git-Newrev: 99060bdfbbf7f906658e7bc72bd34cbe3cd61438

The following commit has been merged in the master branch:
commit 88a8b9a072d47905142eefc24dc3c90a210167bd
Merge: cb49ef8e70c9e3a1c084dfc33aef27c1ff91e974 d70e0b63233c5dc9d4ffa4d2481a67b9543ab5b0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 28 22:58:26 2011 +0100

    Merge branch 'master' into master.snapshot


-- 
FFmpeg packaging