diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:13:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:13:51 +0200 |
| commit | c6d39fb3c5a763c2cfba34154e0f8ba52f02a96e (patch) | |
| tree | 2c2e94db251ff485d92f4ee81396342265132b9b /libswscale | |
| parent | cd6f5c4895c49b483542030324ea5198521ab28b (diff) | |
| parent | 4b895cb294d610fb3bf9e57385e665488e8a9ffa (diff) | |
| download | ffmpeg-c6d39fb3c5a763c2cfba34154e0f8ba52f02a96e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: sanitize linking of tools and test programs
fate: Refactor setting of environment variables for groups of tests
Conflicts:
tests/fate/audio.mak
tests/fate/real.mak
tests/fate/voice.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions