Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 20:03:35 +0000 (21:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 20:09:17 +0000 (21:09 +0100)
commitf392949f1ac799ad1d7c1cda66e41c1670022d5a
treee3b97d59c99dfc21cf92abb7b71305f4e59f408a
parent68014c6ed98b5c90f4dc211429dd269ac727be4b
parentae17878fb2ab100264226c84c58f5b95a703312f
Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'

* commit 'ae17878fb2ab100264226c84c58f5b95a703312f':
  BRender PIX image decoder

Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/version.h

See: 492a5f835c59ab7c2e347d3579d8bf6148ae0a0, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/brenderpix.c
libavcodec/codec_desc.c
libavcodec/utils.c
libavcodec/version.h
libavformat/img2.c