diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:34:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:34:37 +0100 |
| commit | f6a80d6e6318e929d22738c0f0ead30bb3ea28da (patch) | |
| tree | bd148fe9f2b84dff03f2ff814044b4d8f8ac3682 /ffserver.c | |
| parent | cf4515ecd985aab899f24a6b7d18432001e670fa (diff) | |
| parent | 9f00b1cbababa08dd220dbc0c74286a4707be746 (diff) | |
| download | ffmpeg-f6a80d6e6318e929d22738c0f0ead30bb3ea28da.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputilenc: x86: Convert pixel inline asm to yasm
libgsm: detect libgsm header path
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions