aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mmvideo.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-24 02:08:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-24 02:08:14 +0200
commit8b59ab1af0ddfe933bfa6b97745b15748c678b4c (patch)
treee5a6662e81d8b0c0d12636497880611aeb4e20e8 /libavcodec/mmvideo.c
parentab0f78ea77779e9f87015910ef235b6d1e6d2ccb (diff)
parentce2e858f5b3416c2d54f7f8c14e901f75c48b785 (diff)
downloadffmpeg-8b59ab1af0ddfe933bfa6b97745b15748c678b4c.tar.gz
Merge commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785'
* commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785': http: K&R formatting cosmetics Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mmvideo.c')
0 files changed, 0 insertions, 0 deletions