aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ffserver-regression.sh
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-28 11:40:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-28 11:40:49 +0200
commit102397d2c14dcb58a032832b04fee2fabe2943b2 (patch)
tree74c6c739dcce3cc714286ab98c5ff7e21a74503d /tests/ffserver-regression.sh
parentedab63a4067ad4cd35d8d9259620983fc7c843f8 (diff)
parent16c22122c788b5e54a2f2e224bd0106429f0714c (diff)
downloadffmpeg-102397d2c14dcb58a032832b04fee2fabe2943b2.tar.gz
Merge commit '16c22122c788b5e54a2f2e224bd0106429f0714c'
* commit '16c22122c788b5e54a2f2e224bd0106429f0714c': h264: K&R formatting cosmetics Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ffserver-regression.sh')
0 files changed, 0 insertions, 0 deletions