FFmpeg/libavcodec
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
..
2013-12-20 19:35:27 +01:00
2013-12-15 16:53:32 +01:00
2013-11-26 13:22:01 +01:00
2013-11-21 20:53:06 +01:00
2013-11-21 20:53:06 +01:00
2013-11-21 20:57:20 +01:00
2013-12-18 18:15:15 +01:00
2013-12-18 22:15:32 +01:00
2013-12-09 08:41:20 +01:00
2013-12-09 08:41:20 +01:00
2013-12-10 16:18:51 +01:00
2013-12-17 22:01:45 +02:00