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
..
2012-08-22 16:41:57 -04:00
2012-10-18 13:12:28 +01:00
2012-05-09 14:13:34 +01:00
2012-05-09 14:13:34 +01:00
2012-10-15 08:32:34 +02:00
2012-10-18 13:12:28 +01:00
2012-10-16 15:45:55 +02:00
2012-09-10 00:07:24 +01:00
2012-10-18 13:12:28 +01:00
2012-06-18 11:47:08 +01:00