diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 16:56:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 16:56:42 +0200 |
| commit | 229a1e8694291c4ae77c27293dc57f78b2e3d223 (patch) | |
| tree | 299c051500cf2106e2a6dd1eac847cc5cacc4afb /libavutil/error.h | |
| parent | 5727d387fb244aa754847494e199ab3b4e084266 (diff) | |
| parent | b2e059a1ffbdaaa985c6a7dcdd684fa034725238 (diff) | |
| download | ffmpeg-229a1e8694291c4ae77c27293dc57f78b2e3d223.tar.gz | |
Merge commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238'
* commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238':
pixdesc: K&R formatting cosmetics
Conflicts:
libavutil/pixdesc.c
libavutil/pixdesc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/error.h')
0 files changed, 0 insertions, 0 deletions