[SCM] ffmpeg/master: Merge commit 'upstream/0.8_beta1'

[siretart at users.alioth.debian.org]

Imported Upstream version 0.8~beta1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6bebc77e873eb5588f779d64e1e9423aec65c611
X-Git-Newrev: 626f1c158c1546853f0ece2df69c550ea0307a49

The following commit has been merged in the master branch:
commit 23250ba7ef701a6452185469f719b3a48b4ae73a
Merge: 6bebc77e873eb5588f779d64e1e9423aec65c611 5146e3178dca4d2f152ab421167d9b30a3da24d3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Dec 30 23:42:16 2011 +0100

    Merge commit 'upstream/0.8_beta1'

diff --combined .gitignore
index acca479,2118a51..f420dde
--- a/.gitignore
+++ b/.gitignore
@@@ -12,9 -12,10 +12,10 @@@ doc/*.htm
  doc/*.pod
  doxy
  ffmpeg
- ffplay
- ffprobe
- ffserver
+ avconv
+ avplay
+ avprobe
+ avserver
  libavcodec/*_tablegen
  libavcodec/*_tables.c
  libavcodec/*_tables.h
@@@ -30,7 -31,6 +31,6 @@@ tests/audioge
  tests/base64
  tests/data
  tests/rotozoom
- tests/seek_test
  tests/tiny_psnr
  tests/videogen
  tests/vsynth1
@@@ -42,6 -42,4 +42,5 @@@ tools/pktdumpe
  tools/probetest
  tools/qt-faststart
  tools/trasher
- tools/trasher*.d
  version.h
 +/.pc

-- 
Libav/FFmpeg packaging