FFmpeg

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

Go to file

Michael Niedermayer 4835332537 Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9'

* commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9':
  rtsp: Support multicast source filters (RFC 4570)
  rtpproto: Check the source IP if one single source has been specified
  rtpproto: Support IGMPv3 source specific multicast inclusion

Conflicts:
	libavformat/rtpproto.c
	libavformat/rtsp.c
	libavformat/rtsp.h

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

2013-07-20 10:39:53 +02:00

compat

Merge remote-tracking branch 'qatar/master'

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

doc

doc/filters: add sepia example for colorchannelmixer

2013-07-19 19:36:37 +00:00

libavcodec

jpeg2000dec: silence unused variable warning

2013-07-19 17:54:57 +02:00

libavdevice

avdevice/lavfi: fix input with unknown channel layout

2013-07-13 23:10:05 +02:00

libavfilter

avfilter/vf_separatefields: fix ;;

2013-07-20 00:44:09 +02:00

libavformat

Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9'

2013-07-20 10:39:53 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2013-07-18 09:53:47 +02:00

libavutil

avutil/softfloat: remove unneeded include assert.h

2013-07-19 18:56:33 +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

cosmetics: Fix "dont" "wont" "doesnt" typos

2013-06-29 02:31:16 +02:00

libswscale

swscale: remove unneeded include assert.h

2013-07-19 18:52:41 +02:00

presets

…

tests

tests/tiny_psnr: remove unneeded include assert.h

2013-07-19 18:55:49 +02:00

tools

Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d'

2013-07-07 11:35:59 +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

lavfi: port perspective filter from libmpcodecs

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

cmdutils_common_opts.h

cmdutils_common_opts: fix indention of #if

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

cmdutils.c

cmdutils: replace exit() by exit_program()

2013-07-08 11:12:32 +02:00

cmdutils.h

Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

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

common.mak

Integrate lcov/gcov into Libav

2013-04-05 18:55:11 +02:00

configure

Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4'

2013-07-19 10:26:07 +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: replace exit() by exit_program()

2013-07-08 11:09:22 +02:00

ffmpeg_opt.c

ffmpeg_opt: do not warn about unused gop_timecode

2013-07-09 10:54:40 +02:00

ffmpeg.c

Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

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

ffmpeg.h

ffmpeg: add -apad option which injects a apad filter only in the presence of video streams

2013-05-08 23:55:06 +02:00

ffplay.c

ffplay: use start_time as next audio pts on flush when seeking is not supported

2013-07-20 02:32:43 +02:00

ffprobe.c

Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

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

ffserver.c

Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4'

2013-07-19 10:26:07 +02:00

INSTALL

…

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: drop 1.1 from the releases that i maintain

2013-07-15 02:30:36 +02:00

Makefile

Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'

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

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.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%