FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Go to file

Michael Niedermayer 11146a9b44 Merge commit '34150be515cd9c43b0b679806b8d01774960af78'

* commit '34150be515cd9c43b0b679806b8d01774960af78':
  build: Let the iac decoder depend on the imc decoder

Conflicts:
	configure

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

2014-03-01 12:27:59 +01:00

compat

compat: provide va_copy for old gcc versions.

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

doc

update for 2.2

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

libavcodec

Merge commit '34150be515cd9c43b0b679806b8d01774960af78'

2014-03-01 12:27:59 +01:00

libavdevice

Add more Bayer colour spaces to the video4linux2 device wrapper.

2014-02-23 13:42:41 +01:00

libavfilter

lavfi/frei0r: factorize plugin loading with static path

2014-02-26 22:48:37 +01:00

libavformat

avformat/ac3dec: Use avpriv_ac3_parse_header2()

2014-03-01 01:56:25 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2014-02-22 21:12:02 +01:00

libavutil

avutil/opt: allow max=min=0 for pixel formats

2014-03-01 00:31:38 +01:00

libpostproc

…

libswresample

swr: check that the context for swr_convert() has been initialized

2014-02-24 08:23:42 +01:00

libswscale

libswscale: bayer to rgb24 & yv12 colorspace converters

2014-02-23 02:38:22 +01:00

presets

…

tests

avformat/movenc: shift positive timestamps to 0 if edit lists cannot be used

2014-02-22 22:39:50 +01:00

tools

tools/uncoded_frame: fix double free

2014-02-13 01:29:01 +01:00

.gitignore

Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'

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

arch.mak

…

Changelog

update for 2.2

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

cmdutils_common_opts.h

Allow hiding the banner.

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

cmdutils_opencl.c

…

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

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

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

configure

Merge commit '34150be515cd9c43b0b679806b8d01774960af78'

2014-03-01 12:27:59 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

…

ffmpeg_opt.c

ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check

2014-02-25 00:05:37 +01:00

ffmpeg_vdpau.c

…

ffmpeg.c

Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

2014-02-24 21:08:19 +01: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: check av_frame_alloc() failure.

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

ffserver.c

ffserver: merge RTSP's teardown & pause routines

2014-02-14 14:31:42 -03:00

INSTALL

…

library.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

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

LICENSE

Add libx265 encoder

2014-02-12 13:13:17 +00:00

MAINTAINERS

update for 2.2

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

Makefile

tools: add uncoded_frame test program.

2014-02-11 10:31:29 +01:00

README

…

RELEASE

Prepare for 10_beta1 Release

2014-02-15 16:49:04 -05:00

version.sh

…

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%