diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-26 19:36:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-26 19:36:28 +0100 |
| commit | 51b7ab2ee70fa6f8f5ee2f7339e92d60ded57834 (patch) | |
| tree | 4b51fe4db4f5dbb398f06b89285f61f2207ba3c1 /tests/ref/vsynth/vsynth_lena-mpeg1b | |
| parent | 43e5e3c077bcc41b54a3d306ea149f2895cabb32 (diff) | |
| parent | 82b6e451161f19ab90bfb9565b710021caf5dcbd (diff) | |
| download | ffmpeg-51b7ab2ee70fa6f8f5ee2f7339e92d60ded57834.tar.gz | |
Merge commit '82b6e451161f19ab90bfb9565b710021caf5dcbd'
* commit '82b6e451161f19ab90bfb9565b710021caf5dcbd':
configure: Move the cross_prefix setting after the toolchain one
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/vsynth/vsynth_lena-mpeg1b')
0 files changed, 0 insertions, 0 deletions