-
Michael Niedermayer authored
* commit '78071a14': pixfmt: add AV_ prefixes to PIX_FMT_* Conflicts: doc/APIchanges libavutil/pixfmt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
ae77266f
* commit '78071a14': pixfmt: add AV_ prefixes to PIX_FMT_* Conflicts: doc/APIchanges libavutil/pixfmt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>