diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 12:01:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 12:01:17 +0200 |
| commit | f3968ab47ca86b1e5bf37815da44ebafe2719d12 (patch) | |
| tree | 60590c776846da685d905a35671ab0f5d2a6ce38 /libavcodec/pnm.c | |
| parent | 90e1fc8bec1ba9ba40bfcc2ce0993dac6260d3af (diff) | |
| parent | 49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48 (diff) | |
| download | ffmpeg-f3968ab47ca86b1e5bf37815da44ebafe2719d12.tar.gz | |
Merge commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48'
* commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48':
oggparsevorbis: K&R formatting cosmetics
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pnm.c')
0 files changed, 0 insertions, 0 deletions