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
8860878291
fate: Introduce ENCMUX macro for tests that require encoders and a muxer
2012-10-20 21:10:21 +02:00
9317b73f11
Merge commit '36ac9a16a19a365ce58cc871484c20cffe9b6401'
...
* commit '36ac9a16a19a365ce58cc871484c20cffe9b6401':
fate: dependencies for seek tests
fate: handle lavf test dependencies entirely in make
Conflicts:
configure
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-18 11:42:42 +02:00
36ac9a16a1
fate: dependencies for seek tests
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-17 22:31:18 +01:00
Michael Niedermayer
Diego Biurrun
Mans Rullgard