1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Michael Niedermayer e755c8ac46 Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade'
* commit '4a27a52a1f74016095b7aee1b4a422cf62217ade':
  fate: Don't use files from SRC_PATH in the actual tests
  indeo4: reuse context block VLC for band instead of defaulting

Conflicts:
	tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-29 04:02:23 +02:00
..