FFmpeg

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

Go to file

Michael Niedermayer 69a6eddd60 Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'

* commit 'f2960097e42ddf9a356bab6547f87906f6999e0a':
  bink: fix a check for the first frame.
  doc/developer: Drop obsolete MPlayer reference
  doc/developer: Add ISC license to list of acceptable licenses
  doc/developer: Add web links for all suggested licenses

Conflicts:
	doc/developer.texi

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

2013-02-01 14:15:30 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'

2013-02-01 14:15:30 +01:00

libavcodec

Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'

2013-02-01 14:15:30 +01:00

libavdevice

lavd/v4l2: read the correct time per frame from devices that support a standard

2013-01-31 15:29:53 +01:00

libavfilter

lavfi/buffersrc: forward filter_frame errors.

2013-01-31 21:03:54 +01:00

libavformat

matroska: fixed missing S_DVBSUB subtitles

2013-02-01 01:49:04 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2013-01-18 13:54:38 +01:00

libavutil

dict: fix memleak

2013-02-01 03:56:51 +01:00

libpostproc

build: postproc cleanup.

2012-12-30 02:27:52 +01:00

libswresample

swr/ build_filter: use av_calloc() fix buffer overflow

2013-01-27 05:58:47 +01:00

libswscale

Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'

2013-01-28 14:11:31 +01:00

presets

presets: specify the codecs.

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

tests

swscale: GBRP output support

2013-01-27 15:28:07 -05: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

Port biquads filters from SoX

2013-01-31 12:13:55 +00:00

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

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

cmdutils.c

cmdline: fix -- to escape files starting with -

2013-01-19 14:50:36 +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

Merge remote-tracking branch 'qatar/master'

2013-01-31 20:03:36 +01: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: remove -crop* and -pad* options

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

ffmpeg.c

ffmpeg: implement -force_key_frames expression evalution

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

ffmpeg.h

ffmpeg: implement -force_key_frames expression evalution

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

ffplay.c

ffplay: flush video filters on seek

2013-01-19 00:48:06 +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

Merge remote-tracking branch 'qatar/master'

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

LICENSE

lavfi: add histeq filter

2013-01-05 10:25:32 +01: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.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%