]> git.sesse.net Git - ffmpeg/commit
Merge commit '03b052c023e1f58d879cb7eeb6421ed39262d39d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Apr 2013 10:29:06 +0000 (12:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Apr 2013 10:34:55 +0000 (12:34 +0200)
commit506ebdac2a32e3fe27afd2ff40268c851fc1a817
tree5ca9861a5459a5f158ce104def62d1f9d2648752
parent2ac6d6b7cdd48b21f021221fec186d1ab424994a
parent03b052c023e1f58d879cb7eeb6421ed39262d39d
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@gmx.at>
14 files changed:
tests/fate-run.sh
tests/fate/avfilter.mak
tests/fate/filter-video.mak
tests/lavfi-regression.sh
tests/ref/fate/filter-crop
tests/ref/fate/filter-crop_scale
tests/ref/fate/filter-crop_scale_vflip
tests/ref/fate/filter-crop_vflip
tests/ref/fate/filter-null
tests/ref/fate/filter-scale200
tests/ref/fate/filter-scale500
tests/ref/fate/filter-vflip
tests/ref/fate/filter-vflip_crop
tests/ref/fate/filter-vflip_vflip