diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 21:31:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 21:31:54 +0200 |
| commit | a698efbc9df3c6e503f395f040f5170de3f5cb85 (patch) | |
| tree | 27a479627b210e389a6641d332f3641703158683 /libavformat/oggparseskeleton.c | |
| parent | fd1e4d66f18372ad21de51bae223a2b699fed885 (diff) | |
| parent | e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472 (diff) | |
| download | ffmpeg-a698efbc9df3c6e503f395f040f5170de3f5cb85.tar.gz | |
Merge commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472'
* commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472':
mpeg: K&R formatting cosmetics
Conflicts:
libavformat/mpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparseskeleton.c')
0 files changed, 0 insertions, 0 deletions