FFmpeg

mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-23 10:20:54 +08:00

Go to file

Michael Niedermayer eaf674ef04 Merge commit 'c34d1099db6f9bc49f30eb3141f87c42b01a3714' into release/2.2

* commit 'c34d1099db6f9bc49f30eb3141f87c42b01a3714':
  nut: Make sure to clean up on read_header failure

Conflicts:
	libavformat/nutdec.c

See: 361702660d
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2015-06-01 13:12:29 +02:00

compat

Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA'

2014-05-31 12:18:31 +02:00

doc

tests: drop bc dependency

2015-05-14 03:49:11 +02:00

libavcodec

Merge commit 'f29cf578923d2d4d2cf891dfc0c7ac45c641a5b7' into release/2.2

2015-06-01 13:11:18 +02:00

libavdevice

Add FFMPEG_VERSION into the binary libs

2015-01-20 03:27:17 +01:00

libavfilter

Fix compilation with !HAVE_6REGS.

2015-06-01 12:01:29 +02:00

libavformat

Merge commit 'c34d1099db6f9bc49f30eb3141f87c42b01a3714' into release/2.2

2015-06-01 13:12:29 +02:00

libavresample

Merge commit '9d02e38d3f03100784348ff75fd181d2aaad7e43' into release/2.2

2014-05-04 20:14:18 +02:00

libavutil

avutil/pca: Check for av_malloc* failures

2015-04-07 12:43:05 +02:00

libpostproc

Add FFMPEG_VERSION into the binary libs

2015-01-20 03:27:17 +01:00

libswresample

swresample/dither: Cleanup number suffixes

2015-02-17 19:43:18 +01:00

libswscale

Fix compilation with !HAVE_6REGS.

2015-06-01 12:01:29 +02:00

presets

presets: specify the codecs.

2012-05-04 18:40:36 +02:00

tests

tests: drop bc dependency

2015-05-14 03:49:11 +02:00

tools

tools/crypto_bench: fix build when AV_READ_TIME is unavailable

2014-09-20 18:40:33 +02:00

.gitattributes

Treat all '*.pnm' files as non-text file

2014-12-01 17:36:05 -08:00

.gitignore

Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'

2014-02-25 20:26:00 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01:00

Changelog

doc: More changelog updates for v10.6

2015-03-08 22:04:40 -04:00

cmdutils_common_opts.h

Allow hiding the banner.

2013-12-29 22:57:20 +01:00

cmdutils_opencl.c

cmdutils_opencl: Use av_malloc_array()

2014-07-14 23:04:44 +02:00

cmdutils.c

cmdutils: Use 64bit for file size/offset related variable in cmdutils_read_file()

2015-01-06 16:10:43 +01:00

cmdutils.h

Allow hiding the banner.

2013-12-29 22:57:20 +01:00

common.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

2014-02-17 02:22:01 +01:00

configure

Merge commit '0ad8d751337efbbd61c0d78762448b043100b653' into release/2.2

2015-03-09 12:49:05 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

COPYING.LGPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

CREDITS

CREDITS: redirect to Git log, remove current outdated content

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

ffmpeg_filter.c

ffmpeg_filter: refuse to configure input without a decoder.

2014-08-05 04:13:38 +02:00

ffmpeg_opt.c

ffmpeg_opt: reduce diff to libav in opt_target() by 16 lines

2014-09-20 14:29:47 +02:00

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

ffmpeg.c

ffmpeg: Fix extradata allocation

2015-04-07 12:43:06 +02:00

ffmpeg.h

Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

2014-02-24 21:08:19 +01:00

ffplay.c

Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'

2014-02-10 13:26:31 +01:00

ffprobe.c

ffprobe: fix crash happening because of new streams occuring

2014-05-21 22:53:49 +02:00

ffserver.c

ffserver: initialize pbuffer in prepare_sdp_description()

2014-08-05 04:45:56 +02:00

INSTALL

Merge remote branch 'qatar/master'

2011-04-08 02:50:13 +02:00

library.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

2014-02-17 02:22:01 +01:00

LICENSE

Merge commit '1a7d1793d6d2de4201c2d9fc7056e7c9e202c5fe' into release/2.2

2014-09-20 14:46:53 +02:00

MAINTAINERS

update for 2.2

2014-03-01 03:34:59 +01:00

Makefile

Makefile: add dependencies which require ffversion.h

2015-01-20 03:27:17 +01:00

README

README: be a tiny bit more verbose

2012-04-06 10:23:26 +02:00

RELEASE

Update for 2.2.15

2015-04-16 16:17:18 +02:00

version.sh

version.sh: Print versions based on the last git tag for release branches

2014-08-05 22:18:00 +02: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 89.4%

Assembly 8.3%

Makefile 1.3%

C++ 0.3%

GLSL 0.3%

Other 0.2%