Michael Niedermayer 0e09761686 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>

2012-10-21 17:01:01 +02:00

5.5 KiB

Raw Blame History

View Raw