Merge commit 'a7d2861d36756b913e85681b86ed3385274e8ced'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Oct 2012 14:32:41 +0000 (16:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Oct 2012 15:01:01 +0000 (17:01 +0200)
commit0e097616865ea8a1fa8e63a451a4921336660283
tree05e40d896f65d266c68a84d2c780acefba791c45
parentaa760b1735907d256758ee67daa64f1e3b09bf0c
parenta7d2861d36756b913e85681b86ed3385274e8ced
Merge commit 'a7d2861d36756b913e85681b86ed3385274e8ced'

* commit 'a7d2861d36756b913e85681b86ed3385274e8ced':
  svq3: K&R formatting cosmetics
  fate: Introduce ENCMUX macro for tests that require encoders and a muxer
  ffv1: Add missing #includes to header file

Conflicts:
libavcodec/ffv1.h
libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ffv1.h
libavcodec/svq3.c
tests/Makefile
tests/fate/avformat.mak
tests/fate/seek.mak