[SCM] ffmpeg/master: Merge branch 'upstream' (libav 0.6.2)

[siretart at users.alioth.debian.org]

Imported Upstream version 0.6.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 482f041614b134b32bc2c0ac0ce788c77c81ef98
X-Git-Newrev: 8a0df8b70744388035c7d151753cec023e90545a

The following commit has been merged in the master branch:
commit a1da5674522cfc1c2e2c00b406b4623fd5779376
Merge: ea8c16263c81651c06e688eab9664932d76aad25 aad52940050693538757a8dd84957840d92f28ec
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 19 08:15:18 2011 +0100

    Merge branch 'upstream' (libav 0.6.2)

diff --combined .gitignore
index b408e6c,eac1758..4ce575b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,45 +1,46 @@@
 +/.pc
+ .config
+ .version
+ *.o
+ *.d
+ *.exe
+ *.ho
+ *-example
+ *-test
+ *_g
+ config.*
+ doc/*.1
+ doc/*.html
+ doc/*.pod
+ doxy
+ ffmpeg
+ ffplay
+ ffprobe
+ ffserver
+ libavcodec/libavcodec*
+ libavcore/libavcore*
+ libavdevice/libavdevice*
+ libavfilter/libavfilter*
+ libavformat/libavformat*
+ libavutil/avconfig.h
+ libavutil/libavutil*
+ libpostproc/libpostproc*
+ libswscale/libswscale*
+ tests/audiogen
+ tests/base64
+ tests/data
+ tests/rotozoom
+ tests/seek_test
+ tests/tiny_psnr
+ tests/videogen
+ tests/vsynth1
+ tests/vsynth2
+ tools/cws2fws
+ tools/graph2dot
+ tools/lavfi-showfiltfmts
+ tools/pktdumper
+ tools/probetest
+ tools/qt-faststart
+ tools/trasher
+ tools/trasher*.d
+ version.h

-- 
FFmpeg packaging