diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-08 19:32:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-08 19:42:49 +0200 |
| commit | ae77266fce26eac4f5267d158c65bdebfb64f780 (patch) | |
| tree | b731b91cf7982db063f38b3da8489484aefa43a3 /libavcodec/jpeglsenc.c | |
| parent | 43c157f4a46cb76739f07782d23d1e4ff8da3253 (diff) | |
| parent | 78071a1420b425dfb787ac739048f523007b8139 (diff) | |
Merge commit '78071a1420b425dfb787ac739048f523007b8139'
* commit '78071a1420b425dfb787ac739048f523007b8139':
pixfmt: add AV_ prefixes to PIX_FMT_*
Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsenc.c')
0 files changed, 0 insertions, 0 deletions