[FFmpeg-cvslog] Merge commit 'a7d2861d36756b913e85681b86ed3385274e8ced'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 21 16:32:41 2012 +0200| [0e097616865ea8a1fa8e63a451a4921336660283] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e097616865ea8a1fa8e63a451a4921336660283
---