diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 22:55:21 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 22:55:21 +0200 |
commit | 4cb59ad84b97e50549f22998b2a83d0a1e7f4b97 (patch) | |
tree | 72b9f769556432e2c39336f152e0975f8e3b8965 /tests/base64.c | |
parent | f4b05cd8415ad6160900bb00565f9b75e356530e (diff) | |
parent | 3eec1d41b4a947ba497f528e68da14a8befb85b9 (diff) | |
download | ffmpeg-4cb59ad84b97e50549f22998b2a83d0a1e7f4b97.tar.gz |
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>
Diffstat (limited to 'tests/base64.c')
0 files changed, 0 insertions, 0 deletions