[SCM] libav/master: Merge tag 'upstream/6%0.8.99-1537-gacb2c79'

[siretart at users.alioth.debian.org]

Imported Upstream version 6:0.8.99-1537-gacb2c79
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2d711ce2376920a2d9489dc4b5cd1c4a40a09fb9
X-Git-Newrev: e6c87543f57437ec2acac55f2bbac83bb4955771

The following commit has been merged in the master branch:
commit cf1889b067188447715a5276dc21c51ff916f29a
Merge: 2d711ce2376920a2d9489dc4b5cd1c4a40a09fb9 b42cd0a042c2c65b17e7b16522bb07975cec5abd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 29 17:25:33 2012 +0200

    Merge tag 'upstream/6%0.8.99-1537-gacb2c79'
    
    Upstream version 6:0.8.99-1537-gacb2c79

diff --combined .gitignore
index f420dde,31a02c0..b73d71a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,9 -1,14 +1,14 @@@
  .config
  .version
+ *.a
  *.o
  *.d
  *.exe
  *.ho
+ *.pc
+ *.so
+ *.so.*
+ *.ver
  *-example
  *-test
  config.*
@@@ -11,22 -16,17 +16,17 @@@ doc/*.
  doc/*.html
  doc/*.pod
  doxy
- ffmpeg
  avconv
  avplay
  avprobe
  avserver
+ doc/avoptions_codec.texi
+ doc/avoptions_format.texi
+ doc/print_options
  libavcodec/*_tablegen
  libavcodec/*_tables.c
  libavcodec/*_tables.h
- libavcodec/libavcodec*
- libavdevice/libavdevice*
- libavfilter/libavfilter*
- libavformat/libavformat*
  libavutil/avconfig.h
- libavutil/libavutil*
- libpostproc/libpostproc*
- libswscale/libswscale*
  tests/audiogen
  tests/base64
  tests/data
@@@ -35,12 -35,13 +35,14 @@@ tests/tiny_psn
  tests/videogen
  tests/vsynth1
  tests/vsynth2
+ tools/aviocat
  tools/cws2fws
  tools/graph2dot
+ tools/ismindex
  tools/lavfi-showfiltfmts
  tools/pktdumper
  tools/probetest
  tools/qt-faststart
  tools/trasher
  version.h
 +/.pc

-- 
Libav/FFmpeg packaging