FFmpeg

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

Go to file

Michael Niedermayer 8b7568cc34 Merge commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc'

* commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc':
  svq3: remove a pointless if()
  h264: remove a pointless if()

Conflicts:
	libavcodec/h264.c
	libavcodec/svq3.c

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

2013-02-16 14:30:21 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +02:00

doc

lavfi: port MP noise filter

2013-02-16 11:42:41 +00:00

libavcodec

Merge commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc'

2013-02-16 14:30:21 +01:00

libavdevice

dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway.

2013-02-15 00:08:12 +01:00

libavfilter

yadif: remove unused variable

2013-02-16 13:24:43 +01:00

libavformat

lavf: dont try to find fps for attached pictures

2013-02-15 03:19:18 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2013-02-13 12:58:29 +01:00

libavutil

Merge commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba'

2013-02-15 12:10:08 +01:00

libpostproc

Fix libpostproc compilation on x86_32 with disable-optimizations.

2013-02-09 15:03:04 +01:00

libswresample

swr: check channel layouts before using them.

2013-02-13 17:50:24 +01:00

libswscale

sws/x86: improve rounding for yuv2yuvX

2013-02-15 23:33:04 +01:00

presets

presets: specify the codecs.

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

tests

Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82'

2013-02-16 09:09:38 +01:00

tools

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

.gitignore

.gitignore: add /doc/examples/pc-uninstalled

2013-01-17 17:59:18 +00:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

lavfi: port MP noise filter

2013-02-16 11:42:41 +00:00

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

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

cmdutils.c

Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'

2013-02-16 13:13:42 +01:00

cmdutils.h

lavf: remove nonexistent symbols

2013-01-11 10:07:52 +00:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

configure

lavfi: port MP noise filter

2013-02-16 11:42:41 +00:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

COPYING.LGPLv3

…

CREDITS

CREDITS: redirect to Git log, remove current outdated content

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

ffmpeg_filter.c

ffmpeg: support filtering of unknown channel layouts.

2013-01-26 11:15:38 +01:00

ffmpeg_opt.c

ffmpeg: dont allow -flags to override -pass

2013-02-06 01:26:26 +01:00

ffmpeg.c

ffmpeg: Check for parameter changes at the output of the audio filter graph

2013-02-14 23:56:51 +01:00

ffmpeg.h

ffmpeg: implement -force_key_frames expression evalution

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

ffplay.c

ffplay: only display frames if there are no pending events

2013-02-15 13:12:10 +01:00

ffprobe.c

ffprobe: do not escape '"' between single quotes.

2013-01-01 13:32:51 +01:00

ffserver.c

ffserver: add missing padding to extradata.

2012-12-30 22:22:18 +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 noise filter

2013-02-16 11:42:41 +00:00

MAINTAINERS

MAINTAINERS: add 1.1, remove 0.10

2013-01-06 21:42:35 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +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.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%