diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-02 22:07:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-02 22:07:06 +0200 |
| commit | c8be5258dec928119fab414341b13c0cf5405294 (patch) | |
| tree | 01c101275f27b02abbda414b4b8d5b0b3dca72bd /libavcodec/x86/proresdsp.asm | |
| parent | 4c731233338d2bc6d9646808b7599224450932c6 (diff) | |
| parent | ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef (diff) | |
| download | ffmpeg-c8be5258dec928119fab414341b13c0cf5405294.tar.gz | |
Merge commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef'
* commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef':
flv: K&R formatting cosmetics
Conflicts:
libavcodec/flv.h
libavcodec/flvdec.c
libavcodec/flvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/proresdsp.asm')
0 files changed, 0 insertions, 0 deletions