FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00

Go to file

Michael Niedermayer 42bf156e13 Merge commit '327c439f811a89d774db9a86f72951d295193e5f'

* commit '327c439f811a89d774db9a86f72951d295193e5f':
  timefilter: Handle memory allocation failure

Conflicts:
	libavdevice/jack_audio.c
	libavdevice/timefilter.c

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

2013-10-29 20:01:00 +01:00

compat

Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1'

2013-08-28 12:46:12 +02:00

doc

lavc: extend documentation for the "bf" option

2013-10-29 18:30:27 +01:00

libavcodec

lavc/mpegvideo_enc: fix typo

2013-10-29 18:36:21 +01:00

libavdevice

timefilter: Fix typo in allocation failure message

2013-10-29 11:38:35 +00:00

libavfilter

Merge remote-tracking branch 'qatar/master'

2013-10-29 11:58:11 +01:00

libavformat

avformat/avisynth: re-add trailing \n.

2013-10-29 19:42:08 +01:00

libavresample

Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'

2013-10-28 09:59:53 +01:00

libavutil

avutil/opt: check flags validity in write_number()

2013-10-28 18:03:29 +01:00

libpostproc

…

libswresample

lswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT

2013-10-17 18:09:54 +02:00

libswscale

lsws: use av_pix_fmt_get_chroma_sub_sample()

2013-10-24 08:12:38 +02:00

presets

…

tests

FATE: add bitexact sws flags to the fieldorder test

2013-10-27 21:34:28 +01:00

tools

Merge remote-tracking branch 'qatar/master'

2013-10-05 11:35:39 +02:00

.gitignore

tools: add benchmark for crypto functions.

2013-09-04 16:36:11 +02:00

arch.mak

…

Changelog

Changelog: add 2.1

2013-10-28 00:39:34 +01:00

cmdutils_common_opts.h

cmdutils: add -colors option

2013-10-27 09:18:45 +01:00

cmdutils.c

cmdutils: fix expected signature for show_colors() function

2013-10-28 09:41:25 +01:00

cmdutils.h

cmdutils: fix expected signature for show_colors() function

2013-10-28 09:41:25 +01:00

common.mak

Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'

2013-10-04 11:49:01 +02:00

configure

Merge commit 'e78913052263af80855590659fb0f705e8f13c8a'

2013-10-29 19:50:03 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

ffmpeg_filter: Fix non jpeg yuv in jpeg support

2013-10-27 17:41:06 +01:00

ffmpeg_opt.c

make it possible to compile ffmpeg without swscale

2013-10-21 13:57:00 +00:00

ffmpeg.c

Merge commit 'ddc589ce98c2bba1e59318b5b0224717325eac46'

2013-10-28 10:46:47 +01:00

ffmpeg.h

ffmpeg: add max_error_rate to allow tuning the point decoding errors are considered a failure of the whole transcoding.

2013-10-07 23:58:59 +02:00

ffplay.c

ffplay: add support for libswresample options

2013-10-26 12:23:54 +02:00

ffprobe.c

ffprobe: fix consistency checks in parse_read_intervals()

2013-10-21 13:33:06 +02:00

ffserver.c

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

2013-10-09 00:30:46 +02:00

INSTALL

…

library.mak

build: remove pointless condition

2013-10-24 10:51:03 +01:00

LICENSE

libavfilter/vf_noise: relicense to LGPL

2013-10-27 20:29:07 +00:00

MAINTAINERS

MAINTAINERS: update which releases i maintain

2013-10-28 00:40:15 +01:00

Makefile

…

README

…

RELEASE

Update for 2.0

2013-07-10 02:15:43 +02: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.1%

Other 0.1%