diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-21 11:45:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-21 11:45:48 +0200 |
| commit | 75fbe41fc61eb8db693d00a529ba7a31830308e1 (patch) | |
| tree | 8f624b56be38fcc5930c667544d7595b8fcd8904 /libavcodec/smvjpegdec.c | |
| parent | 1f7acf3cff0627c38f26f5a749389e156ab1fad0 (diff) | |
| parent | fcae3ff124ee97c9265e3b93f3d41238b2aee9bd (diff) | |
| download | ffmpeg-75fbe41fc61eb8db693d00a529ba7a31830308e1.tar.gz | |
Merge commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd'
* commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd':
dsicinav: K&R formatting cosmetics
Conflicts:
libavcodec/dsicinav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/smvjpegdec.c')
0 files changed, 0 insertions, 0 deletions