ffmpeg

Go to file

Michael Niedermayer b65c290f7f Merge commit '52254067b312e78d30bbe79fc33dbdf995b22b4e' into release/1.1

* commit '52254067b312e78d30bbe79fc33dbdf995b22b4e':
  error_concealment: avoid using the picture if not fully setup

Conflicts:
	libavcodec/error_resilience.c

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

2014-08-08 16:06:27 +02:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +02:00

doc

Update for FFmpeg 1.1.12

2014-06-26 00:13:49 +02:00

libavcodec

Merge commit '52254067b312e78d30bbe79fc33dbdf995b22b4e' into release/1.1

2014-08-08 16:06:27 +02:00

libavdevice

avdevice/v4l2: only use average frame rate if set

2014-03-07 04:04:07 +01:00

libavfilter

Merge commit '3a6bc3e381647bb4434317113f131f7e0ab5bf83' into release/1.1

2014-08-08 14:06:36 +02:00

libavformat

Merge commit 'd7dbc687e312a91ef2ccf797d57b95c61d0e8a2f' into release/1.1

2014-08-08 12:52:20 +02:00

libavresample

Merge commit 'dccac759d39e761398d3d4172ae0b98c0186efa5' into release/1.1

2014-04-21 17:13:58 +02:00

libavutil

avutil/cpu: force mmx on selection of higher x86 SIMD features

2014-06-25 23:15:37 +02:00

libpostproc

build: postproc cleanup.

2012-12-30 02:27:52 +01:00

libswresample

swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input

2014-05-10 21:55:41 +02:00

libswscale

sws: dont use the optimized 410->420 unscaled conversion when height%4

2014-05-10 21:55:41 +02:00

presets

presets: specify the codecs.

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

tests

Merge commit '58d7b835e3cec48ab5a2393405fe82dee72c06a0' into release/1.1

2014-08-08 14:14:06 +02:00

tools

Merge commit 'cb95c1935f43ee6ae7fd15439df0f674e809f180' into release/1.1

2014-04-21 13:32:22 +02:00

.gitignore

Add examples/resampling_audio to .gitignore.

2012-12-06 12:13:01 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

2012-12-20 02:38:18 +01:00

cmdutils.c

cmdutils: update copyright year to 2014.

2014-04-14 16:55:37 -04:00

cmdutils.h

cmdutils: avtool -> fftool

2013-05-13 00:45:09 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

configure

configure: use pkg-config to detect libbluray

2014-04-22 00:21:27 +02: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

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01:00

ffmpeg_filter.c

ffmpeg_filter: fix pointer to local outside scope

2014-05-10 21:55:41 +02:00

ffmpeg_opt.c

Merge commit 'd16515ae5fe7daa6327d903cafb9a5ee43477b1e' into release/1.1

2014-08-08 14:13:40 +02:00

ffmpeg.c

Merge commit 'ba8ab4e7ae016cf970b0f335a7933f2db53784bc' into release/1.1

2014-06-20 01:11:54 +02:00

ffmpeg.h

Merge commit 'ba8ab4e7ae016cf970b0f335a7933f2db53784bc' into release/1.1

2014-06-20 01:11:54 +02:00

ffplay.c

Replace references to "que" with the appropriate word.

2013-01-03 00:21:47 +01:00

ffprobe.c

ffprobe: do not escape '"' between single quotes.

2013-01-01 13:32:51 +01:00

ffserver.c

ffserver: strip odd chars from html error messages before sending them back

2013-10-09 00:55:38 +02:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

LICENSE

lavfi: add histeq filter

2013-01-05 10:25:32 +01:00

MAINTAINERS

MAINTAINERS: mention that people are welcome to pick up and maintain older releases

2013-03-18 03:35:47 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

README

README: be a tiny bit more verbose

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

RELEASE

Prepare for 9.14 Release

2014-06-26 21:23:39 -04:00

VERSION

Update for FFmpeg 1.1.12

2014-06-26 00:13:49 +02:00

version.sh

version.sh: handle shallow clones and snapshots.

2011-07-22 10:43:59 +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 92.1%

Assembly 6%

Makefile 1.2%

C++ 0.3%

Objective-C 0.2%

Other 0.1%