diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-03 23:15:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-03 23:15:37 +0200 |
| commit | 3ea5beab8f7352c94f71148ab98dd247412129a3 (patch) | |
| tree | 19fe460efe5b81d158d46f9c50e0feee8992f7bd /libavcodec/libfaac.c | |
| parent | 0a5cc20d4aace91fdc8c56149bfee1efb726da8c (diff) | |
| parent | c6b42e85493915a3c3891345f57422f9031a0b4f (diff) | |
| download | ffmpeg-3ea5beab8f7352c94f71148ab98dd247412129a3.tar.gz | |
Merge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f'
* commit 'c6b42e85493915a3c3891345f57422f9031a0b4f':
flv: K&R formatting cosmetics
Conflicts:
libavcodec/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfaac.c')
0 files changed, 0 insertions, 0 deletions