aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ffserver.conf
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-22 02:45:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-22 02:45:45 +0200
commitdac096cf39d24735f1992b7d867519f17974865b (patch)
tree94803d59c376db3bd998de821b517e21661a2993 /tests/ffserver.conf
parent7f1543d46cd88e86bd662695d79c16c93892223e (diff)
parentbb0babd7054bed7edfd9f4d6b20cdba864de1830 (diff)
downloadffmpeg-dac096cf39d24735f1992b7d867519f17974865b.tar.gz
Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'
* commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830': build: Support executable only ldflags Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ffserver.conf')
0 files changed, 0 insertions, 0 deletions