Merge commit 'b963f021b603509b5159873de4919dec441d0782'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Apr 2013 11:34:23 +0000 (13:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Apr 2013 11:34:23 +0000 (13:34 +0200)
commit124244ec48c1b733b7ad40eee67ae1a205f0162b
tree008dc0200bf07f47103ba573a247c8e8ba15fc78
parent04001767728fd4ed8b4f9d2ebbb9f9a8c9a7be0d
parentb963f021b603509b5159873de4919dec441d0782
Merge commit 'b963f021b603509b5159873de4919dec441d0782'

* commit 'b963f021b603509b5159873de4919dec441d0782':
  fate: Invoke pixfmts lavfi tests through fate-run.sh

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
tests/Makefile
tests/fate-run.sh
tests/fate/avfilter.mak
tests/fate/filter-video.mak
tests/lavfi-regression.sh
tests/ref/fate/filter-pixfmts-copy
tests/ref/fate/filter-pixfmts-crop
tests/ref/fate/filter-pixfmts-hflip
tests/ref/fate/filter-pixfmts-null
tests/ref/fate/filter-pixfmts-pad
tests/ref/fate/filter-pixfmts-scale
tests/ref/fate/filter-pixfmts-vflip