[FFmpeg-cvslog] Merge commit '03b052c023e1f58d879cb7eeb6421ed39262d39d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 28 12:29:06 2013 +0200| [506ebdac2a32e3fe27afd2ff40268c851fc1a817] | committer: Michael Niedermayer

Merge commit '03b052c023e1f58d879cb7eeb6421ed39262d39d'

* commit '03b052c023e1f58d879cb7eeb6421ed39262d39d':
  fate: Invoke standard lavfi tests through fate-run.sh

Conflicts:
	tests/fate/avfilter.mak
	tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=506ebdac2a32e3fe27afd2ff40268c851fc1a817
---