Go to file
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
compat
doc Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b' 2013-12-22 11:53:41 +01:00
libavcodec Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b' 2013-12-22 11:53:41 +01:00
libavdevice
libavfilter lavfi/hue: show first decimal value of saturation 2013-12-20 19:25:42 +01:00
libavformat Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b' 2013-12-22 11:53:41 +01:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2013-12-20 13:16:56 +01:00
libpostproc
libswresample
libswscale swscale/x86/rgb2rgb_template: try to fix build failure with avx disabled 2013-12-16 03:38:13 +01:00
presets
tests Merge remote-tracking branch 'qatar/master' 2013-12-19 03:18:07 +01:00
tools
.gitignore
arch.mak
Changelog Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b' 2013-12-22 11:53:41 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b' 2013-12-22 11:53:41 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c remuxing .opus files to .webm codec->delay must be copied too 2013-12-19 23:43:14 +01:00
ffmpeg.h
ffplay.c
ffprobe.c ffprobe: drop dependancy on sizeof(AVFrame) 2013-12-17 17:11:00 +01:00
ffserver.c ffserver: extend report_config_error() facilities, and use it for warnings 2013-12-16 19:19:04 +01:00
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: remove ffserver maintainership status notice 2013-12-13 09:42:15 +01:00
Makefile
README
RELEASE
version.sh

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

2) Licensing
------------

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.