FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00

Go to file

Michael Niedermayer 6c019f05ed Merge commit '718907cd881a0b593264aed059c0e00da13f9e15'

* commit '718907cd881a0b593264aed059c0e00da13f9e15':
  libtwolame MP2 encoding support

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/libtwolame.c
	libavcodec/version.h

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

2014-04-09 02:17:56 +02:00

compat

Merge remote-tracking branch 'qatar/master'

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

doc

Merge commit '718907cd881a0b593264aed059c0e00da13f9e15'

2014-04-09 02:17:56 +02:00

libavcodec

Merge commit '718907cd881a0b593264aed059c0e00da13f9e15'

2014-04-09 02:17:56 +02:00

libavdevice

pulseaudio: move NULL check up before dereference.

2014-04-06 19:38:51 +02:00

libavfilter

avfilter/vf_colormatrix: fix memleak on error

2014-04-08 01:25:00 +02:00

libavformat

rtspcodes: don't check for >0 on error codes macro

2014-04-08 18:05:02 -03:00

libavresample

Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'

2014-04-05 19:16:39 +02:00

libavutil

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

2014-04-07 02:15:18 +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: use av_malloc_array() where appropriate

2014-04-08 00:29:26 +02:00

libswscale

swscale/utils: scale filter_size in warning so that it can be used as max for the compile time define

2014-04-09 00:57:12 +02:00

presets

…

tests

Read aspect ratio from tiff image files.

2014-04-07 15:30:48 +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 '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

2014-04-07 02:15:18 +02:00

Changelog

libtwolame MP2 encoding support

2014-04-07 23:50:33 +02:00

cmdutils_common_opts.h

…

cmdutils_opencl.c

…

cmdutils.c

cmdutils: use av_mallocz_array()

2014-04-08 15:44:32 +02: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

configure: AVI demux needs exif

2014-04-08 20:14:49 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

…

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

…

ffmpeg.c

ffmpeg: frame droping due to fps should not be a warning

2014-04-04 21:15:31 +02: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

…

ffserver.c

ffserver: don't hardcode RTSP status codes

2014-04-07 00:24:00 -03:00

INSTALL

…

library.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

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

LICENSE

…

MAINTAINERS

MAINTAINER: Add CC for dshow maintainer

2014-04-03 01:41:23 +02:00

Makefile

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

2014-04-07 02:15:18 +02:00

README

…

RELEASE

RELEASE: update for 2.2

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

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%