FFmpeg

Go to file

Michael Niedermayer e4fc7e3d4d Merge commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73'

* commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73':
  libmp3lame: add comments about CBR/VBR modes

Conflicts:
	libavcodec/libmp3lame.c

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

2014-03-31 02:18:24 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2014-03-10 12:05:02 +01:00

doc

doc/indevs: Fix example for QTKit usage.

2014-03-30 21:29:25 +02:00

libavcodec

Merge commit '729d821fd864a0568f4068e64d3a70faa23b9309'

2014-03-31 02:16:41 +02:00

libavdevice

lavd: Add QTKit input device.

2014-03-30 20:45:07 +02:00

libavfilter

avfilter/lavfutils: call av_find_stream_info() before reading various information about the stream

2014-03-28 17:29:26 +01:00

libavformat

Merge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8'

2014-03-31 01:58:14 +02:00

libavresample

Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

2014-03-26 14:50:55 +01:00

libavutil

avutil/opt: dont crash on av_opt_set_dict() with NULL

2014-03-30 15:00:03 +02:00

libpostproc

Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported.

2014-03-18 23:39:30 +01:00

libswresample

swresample/resample: sse float linear interpolation

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

libswscale

Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

2014-03-26 14:50:55 +01:00

presets

…

tests

Merge commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a'

2014-03-31 01:32:02 +02:00

tools

tools/uncoded_frame: fix audio codec generation

2014-03-29 09:25:14 +01:00

.gitignore

Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'

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

arch.mak

Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'

2014-03-13 22:35:47 +01:00

Changelog

lavd: Add QTKit input device.

2014-03-30 20:45:07 +02: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/filter_codec_opts: do not discard all options for CODEC_ID_NONE

2014-03-28 17:29:26 +01:00

cmdutils.h

Merge commit '85698be461c07be10d873dd34348bcfe9ffc56e0'

2014-03-29 14:33:39 +01:00

common.mak

lavd: Add QTKit input device.

2014-03-30 20:45:07 +02:00

configure

lavd: Add QTKit input device.

2014-03-30 20:45:07 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

ffmpeg_opt.c

ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams

2014-03-16 15:15:02 +01:00

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

ffmpeg.c

Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'

2014-03-25 19:25:10 +01:00

ffmpeg.h

Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'

2014-03-24 16:40:35 +01:00

ffplay.c

ffplay: display information on stream cycling

2014-03-12 00:32:38 +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:12:22 +00:00

MAINTAINERS

lavd: Add QTKit input device.

2014-03-30 20:45:07 +02:00

Makefile

Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'

2014-03-13 22:35:47 +01:00

README

…

RELEASE

RELEASE: update for 2.2

2014-03-01 17:09:12 +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.6%

Assembly 7.5%

Makefile 1.3%

C++ 0.2%

Objective-C 0.1%

Other 0.1%