* commit 'ae17878fb2ab100264226c84c58f5b95a703312f': BRender PIX image decoder Conflicts: doc/general.texi libavcodec/Makefile libavcodec/version.h See: 492a5f835c, and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
492a5f835c