Merge commit '3eec1d41b4a947ba497f528e68da14a8befb85b9'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Apr 2013 20:55:21 +0000 (22:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Apr 2013 20:55:21 +0000 (22:55 +0200)
commit4cb59ad84b97e50549f22998b2a83d0a1e7f4b97
tree72b9f769556432e2c39336f152e0975f8e3b8965
parentf4b05cd8415ad6160900bb00565f9b75e356530e
parent3eec1d41b4a947ba497f528e68da14a8befb85b9
Merge commit '3eec1d41b4a947ba497f528e68da14a8befb85b9'

* commit '3eec1d41b4a947ba497f528e68da14a8befb85b9':
  fate: Reuse VREF and AREF variables where appropriate

Conflicts:
tests/fate/filter.mak
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/Makefile
tests/fate/filter.mak
tests/fate/utvideo.mak
tests/fate/video.mak