FFmpeg

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

Go to file

Michael Niedermayer a1ce060c51 Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'

* commit '5c439b41d0489412c0a4cf6dfb98915251677b8e':
  avfilter: have avfilter_get_by_name return const for next bump

Conflicts:
	libavfilter/version.h

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

2013-10-28 13:07:05 +01:00

compat

Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1'

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

doc

doc/RELEASE_NOTES: update for 2.1

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

libavcodec

Merge commit '97de206b44a48da726807cc3e7b9448a8112760b'

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

libavdevice

avdevice/pulse_audio_enc: remove double ;

2013-10-28 00:52:11 +01:00

libavfilter

Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'

2013-10-28 13:07:05 +01:00

libavformat

Merge commit '53151723e377b9c43f876e20d7f27a17993256c8'

2013-10-28 12:17:57 +01:00

libavresample

Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'

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

libavutil

Merge commit '0b357a8095e72b092cc5c2aacc2f806db75ecae3'

2013-10-28 11:26:48 +01:00

libpostproc

postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q"

2013-06-16 18:21:39 +02:00

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

presets: specify the codecs.

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

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

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

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 'de6061203e2d509579ab110fb1873aade34320f5'

2013-10-28 11:32:22 +01: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

CREDITS: redirect to Git log, remove current outdated content

2013-01-31 18:02:52 +01:00

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

Merge remote branch 'qatar/master'

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

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

Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'

2013-05-24 13:01:41 +02:00

README

README: be a tiny bit more verbose

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

RELEASE

Update for 2.0

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

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%