diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 04:25:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 04:25:56 +0100 |
| commit | b22c16daafdf314a102b7f9d3810246cb45c2363 (patch) | |
| tree | a740d6ed3be1f0a56ce581d8471863df2f5ebc29 /arch.mak | |
| parent | fb06b8ba9371495d051d2fd815a21fb1c1392b73 (diff) | |
| parent | a1ba1f20b350cb89e645f17bdb237d027170db33 (diff) | |
| download | ffmpeg-b22c16daafdf314a102b7f9d3810246cb45c2363.tar.gz | |
Merge commit 'a1ba1f20b350cb89e645f17bdb237d027170db33'
* commit 'a1ba1f20b350cb89e645f17bdb237d027170db33':
mjpegenc: cosmetics, reformat jpeg_put_comments()
Conflicts:
libavcodec/mjpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions