diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 21:20:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 21:20:39 +0200 |
| commit | 5403a288a7fae455044d1d937bbf502031915fb4 (patch) | |
| tree | 135ff706fed6c59d3af3b35a4f270e18aac0c1f6 /libavcodec/adpcmenc.c | |
| parent | b3b05a11d31d544025c0400a1c6bc70124300a86 (diff) | |
| parent | 8d27bf1cff35be406b0fd89d832e1852d4c573bc (diff) | |
| download | ffmpeg-5403a288a7fae455044d1d937bbf502031915fb4.tar.gz | |
Merge commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc'
* commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc':
x86: xvid: K&R formatting cosmetics
Conflicts:
libavcodec/x86/xvididct_sse2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcmenc.c')
0 files changed, 0 insertions, 0 deletions