diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-02 20:03:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-02 20:08:01 +0100 |
| commit | a6c455cf6bb239280cae19e0eb94fa453ced2db7 (patch) | |
| tree | d445acdebd71cc68e0978b2576747721ee6ef727 /ffserver.c | |
| parent | c490cd4c1ae36246e9ae510c252dce65a432c125 (diff) | |
| parent | ad477710244c761ad1c21246c34e0075fee12d11 (diff) | |
| download | ffmpeg-a6c455cf6bb239280cae19e0eb94fa453ced2db7.tar.gz | |
Merge commit 'ad477710244c761ad1c21246c34e0075fee12d11'
* commit 'ad477710244c761ad1c21246c34e0075fee12d11':
build: Add shorthand for HOSTCC compile macro
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions