FFmpeg

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

Go to file

Michael Niedermayer 64591f8f86 Merge commit '9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf'

* commit '9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf':
  h264: check that execute_decode_slices() is not called too many times

Conflicts:
	libavcodec/h264.c

The check is replaced by an assert() as the mb index should not ever go out
of bounds.

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

2014-01-06 16:39:38 +01:00

compat

compat: provide va_copy for old gcc versions.

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

doc

Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'

2014-01-05 22:12:41 +01:00

libavcodec

Merge commit '9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf'

2014-01-06 16:39:38 +01:00

libavdevice

pulse: get latency only when needed

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

libavfilter

avfilter/vf_format: check that the format list is not empty

2014-01-05 20:14:03 +01:00

libavformat

Merge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'

2014-01-06 15:34:45 +01:00

libavresample

Merge commit 'cc976a75dffa148d655b52604331679ff669e8a2'

2014-01-04 02:30:07 +01:00

libavutil

Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'

2014-01-05 22:12:41 +01:00

libpostproc

postproc: fix null pointer dereference with invalid option strings

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

libswresample

Avoid using empty macro arguments.

2013-12-31 12:19:59 +01:00

libswscale

swscale/arm: fix build error with --enable-shared

2013-12-28 14:28:25 +01:00

presets

presets: specify the codecs.

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

tests

Merge commit '060667195e6e6bc0fa63ce13c47e23aabe70d122'

2014-01-06 13:24:48 +01:00

tools

tools/zmqsend: rename ctx to zmq_ctx

2013-12-23 18:44:52 +01:00

.gitignore

Merge commit '3cd612d44789948f72b52944474e0870c5c60964'

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

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

Changelog: add nuts side & metadata support

2014-01-04 15:07:52 +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

Merge remote-tracking branch 'qatar/master'

2014-01-05 13:29:44 +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: use timestamp from before and after the decoder to detect backward moving dts for discontinuity detection

2013-12-22 19:48:00 +01:00

ffmpeg.h

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

2013-11-23 14:46:48 +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

libavfilter/vf_noise: relicense to LGPL

2013-10-27 20:29:07 +00: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

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.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%