diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-18 13:16:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-18 13:19:24 +0100 |
| commit | ceb0d79f46463dc10fb413e7e5ca799967b06475 (patch) | |
| tree | 5e34c573a174a5f87b564f3e5ab3f7e1bde76eee /libavcodec/svq3.c | |
| parent | 48f7d5f0cfd246642f8e3d695152ceb69d27852f (diff) | |
| parent | 86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a (diff) | |
| download | ffmpeg-ceb0d79f46463dc10fb413e7e5ca799967b06475.tar.gz | |
Merge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a'
* commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a':
mpegts: K&R formatting cosmetics
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq3.c')
0 files changed, 0 insertions, 0 deletions