4 Commits

Author	SHA1	Message	Date
Michael Niedermayer	2a3cb1cfca	Merge remote-tracking branch 'qatar/master' ... * qatar/master: Use av_frame_copy() to simplify code where appropriate. Conflicts: libavfilter/vf_copy.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-02-24 10:47:47 +01:00
Anton Khirnov	30517a9f05	Use av_frame_copy() to simplify code where appropriate.	2014-02-24 07:25:07 +01:00
Michael Niedermayer	6fe5f770db	Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b' ... * commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b': Add a libwebp encoder Conflicts: Changelog doc/encoders.texi doc/general.texi libavcodec/version.h libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-12-22 11:53:41 +01:00
Justin Ruggles	be7c323176	Add a libwebp encoder	2013-12-21 17:01:42 -05:00