FFmpeg

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

Go to file

Michael Niedermayer 2bfcd74ad3 Merge commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f'

* commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f':
  mpeg12: Move Mpeg1Context declaration to the only place it is used

Conflicts:
	libavcodec/mpeg12.h
	libavcodec/mpeg12dec.c

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

2013-03-28 11:56:05 +01:00

compat

Provide local copies of AviSynth's and AvxSynth's requisite headers in compat/avisynth/.

2013-03-21 04:23:24 +01:00

doc

doc: "av* tools" -> "ff* tools".

2013-03-27 01:44:20 +01:00

libavcodec

Merge commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f'

2013-03-28 11:56:05 +01:00

libavdevice

dshow_pin: dont return a value from a void function

2013-03-25 22:12:07 +01:00

libavfilter

vsrc_mandelbrot: Mandel morphing support

2013-03-27 19:27:37 +01:00

libavformat

estimate_timings_from_bit_rate: Check timebase and bitrate

2013-03-28 01:45:01 +01:00

libavresample

Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'

2013-03-28 11:20:41 +01:00

libavutil

Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'

2013-03-28 11:20:41 +01:00

libpostproc

libpostproc: silence valgrind/fate warning about using uninitialized data

2013-03-25 21:48:45 +01:00

libswresample

buildsys: only include log2_tab per library for shared builds

2013-03-04 12:25:02 +01:00

libswscale

Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'

2013-03-28 11:20:41 +01:00

presets

presets: specify the codecs.

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

tests

tests/tiny_ssim: include the 2 macros instead of a header

2013-03-27 01:38:18 +01:00

tools

tools: add audio normalize script example.

2013-03-26 01:50:13 +01:00

.gitignore

tools: add tiny_ssim

2013-03-26 17:31:41 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

Changelog: add WebP

2013-03-22 23:19:07 +01:00

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

2012-12-20 02:38:18 +01:00

cmdutils.c

opt: re-enable memleak fix for duplicated options.

2013-03-13 07:25:16 +01:00

cmdutils.h

Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'

2013-03-12 18:10:35 +01:00

common.mak

Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74'

2013-02-24 15:24:38 +01:00

configure

Merge commit 'd767e2f969933b4e450ed4e69ea2bf8ca864838c'

2013-03-28 10:54:17 +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: Replace -deinterlace (which was broken by the buffer ref stuff) with yadif injection

2013-03-21 13:54:04 +01:00

ffmpeg_opt.c

ffmpeg_opt: avoid strcpy()

2013-03-26 01:51:19 +01:00

ffmpeg.c

Call do_video_stats when duplicating frame

2013-03-23 12:29:12 +01:00

ffmpeg.h

ffmpeg: Correct inter stream timestamp discontinuities

2013-03-23 04:53:44 +01:00

ffplay.c

ffplay: avoid frame data leak on early frame drop

2013-03-23 02:25:33 +01:00

ffprobe.c

ffprobe: set writer context to 0 after allocation

2013-03-19 18:00:34 +01:00

ffserver.c

ffserver/ctime1: avoid using strcpy()

2013-03-25 23:31:34 +01:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

build: fixes a "can't cd to..." issue when installing shared libraries.

2013-02-15 08:39:35 +01:00

LICENSE

lavfi: port MP stereo3d filter

2013-03-05 18:36:40 +00:00

MAINTAINERS

Update MAINTAINERS with information about avisynth demuxer.

2013-03-27 03:47:56 +01:00

Makefile

tools: add tiny_ssim

2013-03-26 17:31:41 +01:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: 1.1.git for master

2013-01-06 21:42:35 +01: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%