[FFmpeg-cvslog] Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'

Michael Niedermayer git at videolan.org
Thu Mar 27 21:32:21 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 27 21:03:35 2014 +0100| [f392949f1ac799ad1d7c1cda66e41c1670022d5a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f392949f1ac799ad1d7c1cda66e41c1670022d5a
---





More information about the ffmpeg-cvslog mailing list