diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 14:32:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 14:32:43 +0200 |
| commit | 8d9537228f034037e710146291a933f0f4f554be (patch) | |
| tree | ec0d82734940cb418d1f424b8c78936a8d703d32 /libswscale/swscale_unscaled.c | |
| parent | 63208c034bf660ed7f15bf09fdd4c813a6e6bf7a (diff) | |
| parent | 06122c253394b10a694d3d95e00e503c89852134 (diff) | |
| download | ffmpeg-8d9537228f034037e710146291a933f0f4f554be.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
msvc: Move linker pragma from config.h to libavutil/internal.h
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_unscaled.c')
0 files changed, 0 insertions, 0 deletions