diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 10:26:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 10:26:00 +0100 |
| commit | 70737b83f06e34a8b4f9eb70948b2f2ca6711992 (patch) | |
| tree | 918a1ec45b3a8622b4c732ddc5db7451849fd509 /libavformat/smjpeg.h | |
| parent | 558784f113f1436a48f34db2612c3b6460e6c734 (diff) | |
| parent | d4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68 (diff) | |
| download | ffmpeg-70737b83f06e34a8b4f9eb70948b2f2ca6711992.tar.gz | |
Merge commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68'
* commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68':
oggparsetheora: K&R cosmetics, reformat
Conflicts:
libavformat/oggparsetheora.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/smjpeg.h')
0 files changed, 0 insertions, 0 deletions