diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:01:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:01:37 +0100 |
| commit | d926c4b240edd86d9ee5c1b449968ac91eeaa918 (patch) | |
| tree | ba72934d12b504eb23a9cd6e79c7588dd3dcc74f /libavcodec/zmbvenc.c | |
| parent | 55f53f6c29acd459df64abf20cbd016c420b6cf6 (diff) | |
| parent | 38675229a879aa5258a8c71891fc8cbf74cf139f (diff) | |
| download | ffmpeg-d926c4b240edd86d9ee5c1b449968ac91eeaa918.tar.gz | |
Merge commit '38675229a879aa5258a8c71891fc8cbf74cf139f'
* commit '38675229a879aa5258a8c71891fc8cbf74cf139f':
dsputil_mmx: K&R formatting cosmetics
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/zmbvenc.c')
0 files changed, 0 insertions, 0 deletions