diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-09 14:27:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-09 14:29:42 +0200 |
| commit | 31d0d355608fc9dfaed55b7541f16cd105fb3995 (patch) | |
| tree | adcf71f7da6cdff5a20f048f250ea5cabc35a9e8 /ffserver.c | |
| parent | 4ce82e6fa94c96ec2db76ce3be200e58f0a577c3 (diff) | |
| parent | ad7d7d4f6a1347d81c349bfbf16632047264e6bf (diff) | |
| download | ffmpeg-31d0d355608fc9dfaed55b7541f16cd105fb3995.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86inc: Remove .rodata kludges
Conflicts:
libavutil/x86/x86inc.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions