diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 16:48:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 16:48:09 +0200 |
| commit | 5727d387fb244aa754847494e199ab3b4e084266 (patch) | |
| tree | d43afa6de47785e7ec8e1d427f57619970574dcc /libavutil/pixdesc.h | |
| parent | c87f645a757e1888932a57a2b5ef8ca44098a9e0 (diff) | |
| parent | 92a36a6b3338df5f5cff573a486e182005367c24 (diff) | |
| download | ffmpeg-5727d387fb244aa754847494e199ab3b4e084266.tar.gz | |
Merge commit '92a36a6b3338df5f5cff573a486e182005367c24'
* commit '92a36a6b3338df5f5cff573a486e182005367c24':
pngdec: correctly indent macros
Conflicts:
libavcodec/pngdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/pixdesc.h')
0 files changed, 0 insertions, 0 deletions