aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-14 02:06:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-14 02:10:15 +0100
commitfd982f2b40b8908a71d25202f0e6842206d8a78a (patch)
tree36690c47c832b10a054787ff97cf5ab76a5df8ba /ffserver.c
parentabb6821e43e74bfce1565c4a6ed75cfb666a2e6d (diff)
parent60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8 (diff)
downloadffmpeg-fd982f2b40b8908a71d25202f0e6842206d8a78a.tar.gz
Merge commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8'
* commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8': configure: avserver does not need $ldl Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions