FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-08 16:54:03 +02:00

Go to file

Michael Niedermayer 797d807869 Merge commit 'eb01a25fe1452740a7f3ae2cbaff356a5c6e7806'

* commit 'eb01a25fe1452740a7f3ae2cbaff356a5c6e7806':
  swscale: fix stride used in planarToNv12Wrapper()

Conflicts:
	libswscale/swscale_unscaled.c

See: 94d7ca2b58af13c379d90aad595e82448743abc7
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-01-21 21:45:24 +01:00

compat

compat: provide va_copy for old gcc versions.

2013-12-30 12:38:03 +01:00

doc

examples/filtering_audio,video: drop call to avcodec_get_frame_defaults()

2014-01-21 20:08:36 +01:00

libavcodec

Merge commit 'e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d'

2014-01-21 21:26:13 +01:00

libavdevice

pulse: get latency only when needed

2014-01-05 18:44:18 +01:00

libavfilter

lavfi/dualinput: fix shortest option.

2014-01-19 17:13:36 +01:00

libavformat

lavf/segment: drop pointless variable oc from seg_write_packet()

2014-01-21 20:08:36 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2014-01-15 15:49:22 +01:00

libavutil

lavu/rational: add syntactic sugar.

2014-01-19 17:12:22 +01:00

libpostproc

postproc: fix null pointer dereference with invalid option strings

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

libswresample

swresample: Add arm&x86 clobber tests

2014-01-18 18:38:57 +01:00

libswscale

Merge commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7'

2014-01-14 14:44:59 +01:00

presets

presets: specify the codecs.

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

tests

fate: add a few tests for >8bpc ffvhuff

2014-01-21 03:20:39 +01:00

tools

Merge commit '87acd33c092ab9e7d73686627e9105d99c1e4928'

2014-01-17 14:38:33 +01:00

.gitignore

examples: add remuxing example

2014-01-20 13:10:10 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

webp: fix capitalization of the word Exif

2014-01-15 02:54:36 +01:00

cmdutils_common_opts.h

Allow hiding the banner.

2013-12-29 22:57:20 +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: update copyright year to 2014.

2014-01-05 22:39:35 +02:00

cmdutils.h

Allow hiding the banner.

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

common.mak

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

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

configure

Move add/diff_int16 to lossless_videodsp

2014-01-20 21:32:47 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

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

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

ffmpeg: do not fail when options are routed to libavformat and libavcodec and only one can be used

2014-01-03 02:24:27 +01:00

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

ffmpeg.c

ffmpeg: change ost->finished to an enum

2014-01-17 23:57:02 +01:00

ffmpeg.h

ffmpeg: change ost->finished to an enum

2014-01-17 23:57:02 +01:00

ffplay.c

ffplay: do not wait for the picture allocation to finish on exit

2013-12-29 13:19:19 +01:00

ffprobe.c

ffprobe: check av_frame_alloc() failure.

2013-12-30 10:58:01 +01:00

ffserver.c

ffserver: extend report_config_error() facilities, and use it for warnings

2013-12-16 19:19:04 +01:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Add Windows resource file support for shared libraries

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

LICENSE

Change license of yadif from GPL to LGPL

2014-01-14 14:19:15 +01:00

MAINTAINERS

MAINTAINERS: add myself for spdif* and hls.c

2014-01-03 15:05:48 +02:00

Makefile

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

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

README

README: be a tiny bit more verbose

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

RELEASE

Prepare for 10_alpha2 Release

2014-01-18 10:27:27 -05: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.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.1%

Other 0.1%