aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-15 20:25:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-15 20:25:12 +0200
commit3bb22973518cbef28504e4d5b9fd74453cc3339c (patch)
tree06b64db5ed44740f1969da46db6dee79aa8d7bec /ffserver.c
parentc1df467d73ee8c6e792ec27c126c5f0e2bc1af9d (diff)
parentefd26bedec9a345a5960dbfcbaec888418f2d4e6 (diff)
downloadffmpeg-3bb22973518cbef28504e4d5b9fd74453cc3339c.tar.gz
Merge commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6'
* commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6': build: Add explanatory comments to (optimization) blocks in the Makefiles Conflicts: libavcodec/ppc/Makefile libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions