FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00

Go to file

Michael Niedermayer 0efbd98e23 Merge commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b'

* commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b':
  flvenc: Don't pretend to support muxing "plain" VP6

Conflicts:
	libavformat/flvenc.c

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

2013-10-10 11:45:45 +02:00

compat

Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1'

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

doc

doc/filters: remove extra spacing in vid.stab section.

2013-10-09 13:22:04 +02:00

libavcodec

Merge commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5'

2013-10-10 11:38:36 +02:00

libavdevice

lavd/xv.c: Include XShm.h before Xvlib.h.

2013-10-09 19:01:11 +02:00

libavfilter

avfilter/buffersink: try to fix AV_NOPTS_VALUE

2013-10-09 16:33:18 +02:00

libavformat

Merge commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b'

2013-10-10 11:45:45 +02:00

libavresample

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

libavutil

Merge remote-tracking branch 'qatar/master'

2013-10-09 14:29:42 +02: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

x86: Fix compilation with nasm on PPC & OS/2

2013-10-08 12:36:19 +02:00

libswscale

Merge commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015'

2013-10-06 11:44:05 +02:00

presets

presets: specify the codecs.

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

tests

fate: fix dpx on big endian

2013-10-06 15:22:18 +02: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

lavd: pulse audio encoder

2013-10-08 14:31:50 +02:00

cmdutils_common_opts.h

cmdutils_common_opts: fix indention of #if

2013-04-11 16:07:46 +02:00

cmdutils.c

cmdutils: print command support in -filters.

2013-09-30 10:15:22 +00:00

cmdutils.h

Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

2013-07-08 04:34:11 +02:00

common.mak

Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'

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

configure

Merge commit '9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1'

2013-10-09 14:17:56 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

CREDITS: redirect to Git log, remove current outdated content

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

ffmpeg_filter.c

ffmpeg_filter: check that the input media type match the filter

2013-08-14 03:03:41 +02:00

ffmpeg_opt.c

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

ffmpeg.c

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

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: avoid direct access to lowres use av_codec_g/set_lowres()

2013-10-03 22:38:54 +02:00

ffprobe.c

ffprobe: print stream channel_layout when available

2013-10-03 09:19:38 +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

Merge commit 'e52567c2954f627d420b30f75f71af2f2e4afe80'

2013-10-08 10:45:37 +02:00

LICENSE

avfilter: port pullup filter from libmpcodecs

2013-09-17 17:03:36 +00:00

MAINTAINERS

MAINTAINERS: add Communication section

2013-10-09 04:04:38 +02: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

…

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%