Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Oct 2012 11:47:47 +0000 (13:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Oct 2012 11:47:47 +0000 (13:47 +0200)
commit93f244e3abc3d75a797535a8da890bb1f9932433
tree8278955c098813fafdf58a5b4011b13f25b7ee03
parentb0554fec0470bf59b0582c80697d28646e37b854
parent0af1fe845a9d7112da0a58d33a4fc81fe7c47e95
Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'

* commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95':
  avformat: Fix references to the removed function av_write_header in comments
  changelog: Mention the MSVC DLL support
  fate: add dependencies for misc microsoft codecs
  fate-twinvq: add dependencies
  fate-mpc: add dependencies
  fate-indeo: add dependencies
  fate-als: add dependencies
  fate: dependencies for demux tests

Conflicts:
Changelog
tests/Makefile
tests/fate/demux.mak
tests/fate/microsoft.mak
tests/fate/mpc.mak
tests/fate/vqf.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavformat/avformat.h
tests/Makefile
tests/fate/demux.mak
tests/fate/microsoft.mak
tests/fate/vqf.mak