diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 21:58:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 21:58:16 +0100 |
| commit | a87188ebdb8307fb4733e04d482a3ae617bd9da4 (patch) | |
| tree | 7bbc253b56f66e5ab502c532b7d47bfadcf8271e /libavcodec/alpha | |
| parent | b20b7724744b2125a2787dd9a70084d806db9862 (diff) | |
| parent | cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e (diff) | |
| download | ffmpeg-a87188ebdb8307fb4733e04d482a3ae617bd9da4.tar.gz | |
Merge commit 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e'
* commit 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e':
arm: dsputil: K&R formatting cosmetics
Conflicts:
libavcodec/arm/dsputil_init_arm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/alpha')
0 files changed, 0 insertions, 0 deletions