diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-02 20:17:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-02 20:17:36 +0100 |
| commit | 6f9be8120d2933268733eded5d6c0eb92341e788 (patch) | |
| tree | f4175a0875818c6ad0bad6f78456205e3780bd59 /ffserver.c | |
| parent | a6c455cf6bb239280cae19e0eb94fa453ced2db7 (diff) | |
| parent | 5a9fcc7d2524d6c0f86b2855019ee9f4cf360276 (diff) | |
| download | ffmpeg-6f9be8120d2933268733eded5d6c0eb92341e788.tar.gz | |
Merge commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276'
* commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276':
build: Add rule for building host-specific object files
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions