FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00

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

Merge remote-tracking branch 'qatar/master'

2013-11-24 23:27:32 +01:00

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

Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'

2013-12-09 20:52:14 +01:00

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

avresample: Include libavutil/avutil.h in version.h

2013-12-06 22:13:20 +01:00

libavutil

Merge remote-tracking branch 'qatar/master'

2013-12-20 13:16:56 +01:00

libpostproc

postproc: fix null pointer dereference with invalid option strings

2013-12-11 22:28:42 +01:00

libswresample

Add Windows resource file support for shared libraries

2013-12-05 23:42:07 +01:00

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

tools/probetest: Check av_realloc() return code

2013-12-11 22:29:22 +01:00

.gitignore

Merge commit '3cd612d44789948f72b52944474e0870c5c60964'

2013-12-01 21:18:11 +01:00

arch.mak

…

Changelog

Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'

2013-12-22 11:53:41 +01:00

cmdutils_common_opts.h

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

cmdutils_opencl.c

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

cmdutils.c

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

cmdutils.h

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

common.mak

common.mak: Less ugly version of the previous windres fix

2013-12-09 02:47:55 +01:00

configure

Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'

2013-12-22 11:53:41 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

CREDITS: redirect to Git log, remove current outdated content

2013-01-31 18:02:52 +01:00

ffmpeg_filter.c

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

ffmpeg_opt.c

Merge remote-tracking branch 'qatar/master'

2013-12-04 04:30:46 +01:00

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

2013-11-23 14:46:48 +01:00

ffmpeg.c

remuxing .opus files to .webm codec->delay must be copied too

2013-12-19 23:43:14 +01:00

ffmpeg.h

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

2013-11-23 14:46:48 +01:00

ffplay.c

Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'

2013-12-11 23:49:44 +01:00

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

Add Windows resource file support for shared libraries

2013-12-05 23:42:07 +01:00

LICENSE

libavfilter/vf_noise: relicense to LGPL

2013-10-27 20:29:07 +00:00

MAINTAINERS

MAINTAINERS: remove ffserver maintainership status notice

2013-12-13 09:42:15 +01:00

Makefile

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

README

…

RELEASE

RELEASE: update to 2.1.git

2013-11-29 16:41:42 +01:00

version.sh

version.sh: add preprocessing guards

2013-11-30 21:42:03 +01:00

README

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.

Languages

C 90.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%