ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-11 08:35:27 +01:00

Go to file

Michael Niedermayer 1dee467d26 Merge commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6'

* commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6':
  nuv: Reset the frame on resize

Conflicts:
	libavcodec/nuv.c

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

2013-08-14 10:44:55 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2013-07-19 11:08:38 +02:00

doc

doc/filters: reformat scale filter doc

2013-08-13 23:51:08 +02:00

libavcodec

Merge commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6'

2013-08-14 10:44:55 +02:00

libavdevice

lavd: Fix make checkheaders

2013-08-11 00:40:30 +02:00

libavfilter

lavfi/ebur128: fix typo: s/negociation/negotiation

2013-08-13 12:43:56 +00:00

libavformat

riff: add msn audio comment

2013-08-13 09:41:28 -04:00

libavresample

Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'

2013-08-03 09:16:36 +02:00

libavutil

libavutil/opt.h: Fix duplicate words

2013-08-12 19:40:29 +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

swresample: fix negative rematrix volumns

2013-07-22 03:24:22 +02:00

libswscale

swscale/utils: Fix potential overflow of srcPos*C before converting to 64bit

2013-08-08 02:56:26 +02:00

presets

presets: specify the codecs.

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

tests

Merge commit 'aae159a7cc4df7d0521901022b778c9da251c24e'

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

tools

Merge commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc'

2013-08-06 14:50:27 +02:00

.gitignore

Rename ffadler to ffhash and expand it using the generic hash API

2013-05-16 17:58:56 +02:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

avcodec/mjpegdec: Read EXIF metadata in JPEG input.

2013-08-13 00:30:34 +02:00

cmdutils_common_opts.h

cmdutils_common_opts: fix indention of #if

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

cmdutils.c

Merge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520'

2013-08-08 11:54:14 +02:00

cmdutils.h

Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

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

common.mak

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

2013-03-28 12:12:38 +01:00

configure

Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'

2013-08-08 12:11:33 +02:00

COPYING.GPLv2

Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.

2009-06-05 09:51:31 +00:00

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: check that the input media type match the filter

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

ffmpeg_opt.c

Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'

2013-08-06 12:41:04 +02:00

ffmpeg.c

Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'

2013-08-06 12:41:04 +02:00

ffmpeg.h

Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'

2013-08-06 12:41:04 +02:00

ffplay.c

ffplay: check for filter EOF return codes

2013-08-09 00:16:13 +02:00

ffprobe.c

ffprobe: add -show_programs option

2013-07-28 16:39:06 +02:00

ffserver.c

ffserver: allocate rc_eq, prevent freeing invalid pointer

2013-08-13 15:24:30 +02:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

2013-03-28 12:12:38 +01:00

LICENSE

lavfi: port perspective filter from libmpcodecs

2013-07-14 16:27:17 +00:00

MAINTAINERS

MAINTAINERS: add myself as maintainer for MIPS and Zeljko Lukac as maintainer for new fixed point FFT

2013-08-13 11:57:26 +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

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 89.8%

Assembly 8.2%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%