[SCM] libav/master: Merge tag 'upstream/0.8.5'

[siretart at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 2bb4b2fe02dc9a596ab0556a3eff07d9d1d79df1
Merge: d3a0f6013a7383103d096810cb6abc4b62b429fd b27533c20459adf467c5a38795e1c78bb6dff68e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 13 11:53:52 2013 +0100

    Merge tag 'upstream/0.8.5'
    
    Upstream version 0.8.5

diff --combined .gitignore
index f420dde,478a1ee..6013838
--- a/.gitignore
+++ b/.gitignore
@@@ -35,6 -35,7 +35,7 @@@ tests/tiny_psn
  tests/videogen
  tests/vsynth1
  tests/vsynth2
+ tools/aviocat
  tools/cws2fws
  tools/graph2dot
  tools/lavfi-showfiltfmts
@@@ -43,4 -44,3 +44,4 @@@ tools/probetes
  tools/qt-faststart
  tools/trasher
  version.h
 +/.pc

-- 
Libav/FFmpeg packaging