[SCM] ffmpeg/master: Merge commit 'upstream/0.7_rc1'

[siretart at users.alioth.debian.org]

Imported Upstream version 0.7~rc1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 25b4e1894ea2f93065be1e01ad24cddd69816be8
X-Git-Newrev: fe8e28bec16d0727def11525f573ba11d47cb3b0

The following commit has been merged in the master branch:
commit a609dcb82ecc8d296e737f20ac95bbeda8444277
Merge: 25b4e1894ea2f93065be1e01ad24cddd69816be8 59002023f2a279994a757979c5efec921e830675
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 14 21:54:17 2011 +0200

    Merge commit 'upstream/0.7_rc1'

diff --combined .gitignore
index 1635833,8887980..acca479
--- a/.gitignore
+++ b/.gitignore
@@@ -15,6 -15,9 +15,9 @@@ ffmpe
  ffplay
  ffprobe
  ffserver
+ libavcodec/*_tablegen
+ libavcodec/*_tables.c
+ libavcodec/*_tables.h
  libavcodec/libavcodec*
  libavdevice/libavdevice*
  libavfilter/libavfilter*
@@@ -41,4 -44,3 +44,4 @@@ tools/qt-faststar
  tools/trasher
  tools/trasher*.d
  version.h
- /.pc
++/.pc

-- 
Libav/FFmpeg packaging