Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 02:02:23 +0000 (04:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 02:02:23 +0000 (04:02 +0200)
commite755c8ac462e85e6c3de4f0207dc6bb5c86409cf
tree79b263a53249817baa638e164c3d61d03d84f5fe
parentca90ca8ce365261355f3b66936b9cc011fdd1cdc
parent4a27a52a1f74016095b7aee1b4a422cf62217ade
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>
libavcodec/indeo4.c
tests/Makefile
tests/fate/filter-audio.mak
tests/fate/filter-video.mak