aboutsummaryrefslogtreecommitdiffstats
path: root/libpostproc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-12 02:45:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-12 02:45:34 +0100
commitdf41cbee85c8aac02646f39a68e2f6b911b73f18 (patch)
tree2b65fe10dcbe8f0b686cb68efa66456f27fd90ee /libpostproc
parentb752d02f42bbefdf8b198f03f166cc98bffcc8e8 (diff)
parent7a2fddb4480121712df560cf619c1c3566cae3ff (diff)
downloadffmpeg-df41cbee85c8aac02646f39a68e2f6b911b73f18.tar.gz
Merge commit '7a2fddb4480121712df560cf619c1c3566cae3ff'
* commit '7a2fddb4480121712df560cf619c1c3566cae3ff': http: K&R formatting cosmetics Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc')
0 files changed, 0 insertions, 0 deletions