FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-12-04 14:00:22 +02:00

Go to file

Michael Niedermayer 016c00cf68 Merge commit '1b6d66745ac1768adb387c2227cdcf4452271149'

* commit '1b6d66745ac1768adb387c2227cdcf4452271149':
  Split MPEG-1/2 decoder code off from MPEG-1/2 common code

Conflicts:
	libavcodec/Makefile
	libavcodec/mpeg12.c

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

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

compat

…

doc

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

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

libavcodec

Merge commit '1b6d66745ac1768adb387c2227cdcf4452271149'

2013-03-28 11:45:50 +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

…

libswscale

Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'

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

presets

…

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

…

Changelog

…

cmdutils_common_opts.h

…

cmdutils.c

…

cmdutils.h

…

common.mak

…

configure

Merge commit 'd767e2f969933b4e450ed4e69ea2bf8ca864838c'

2013-03-28 10:54:17 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

…

ffmpeg_opt.c

ffmpeg_opt: avoid strcpy()

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

ffmpeg.c

…

ffmpeg.h

…

ffplay.c

…

ffprobe.c

…

ffserver.c

ffserver/ctime1: avoid using strcpy()

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

INSTALL

…

library.mak

…

LICENSE

…

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

…

RELEASE

…

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

Assembly 8.1%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%