FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-08 16:54:03 +02:00

Go to file

Michael Niedermayer f42635a50b Merge commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff'

* commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff':
  vf_setpts: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/f_setpts.c

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

2013-04-10 23:49:58 +02: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

Merge commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff'

2013-04-10 23:49:58 +02:00

libavcodec

Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525'

2013-04-10 12:41:06 +02:00

libavdevice

lavd/v4l2: fully init an ioctl argument.

2013-04-01 10:38:14 +02:00

libavfilter

Merge commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff'

2013-04-10 23:49:58 +02:00

libavformat

lavf: add libquvi demuxer.

2013-04-10 12:09:20 +02:00

libavresample

Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'

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

libavutil

lavu/eval: rename "new_eval_expr()" to "make_eval_expr()"

2013-04-10 13:11:27 +02:00

libpostproc

lavfi/pp: switch to an AVOptions-based system.

2013-04-10 23:16:03 +02:00

libswresample

buildsys: only include log2_tab per library for shared builds

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

libswscale

Replace all occurrences of PRI in sscanf() calls with SCN

2013-04-10 09:56:48 +02:00

presets

presets: specify the codecs.

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

tests

lavfi/pp: switch to an AVOptions-based system.

2013-04-10 23:16:03 +02:00

tools

Replace all occurrences of PRI in sscanf() calls with SCN

2013-04-10 09:56:48 +02:00

.gitignore

Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'

2013-04-06 13:23:38 +02:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

lavf: add libquvi demuxer.

2013-04-10 12:09:20 +02:00

cmdutils_common_opts.h

cmdutils_common_opts: fix loglevel help text as its inaccurate

2013-03-31 18:06:18 +02:00

cmdutils.c

cmdutils: remove error message from opt_default() in case of missing option

2013-04-05 10:48:32 +02:00

cmdutils.h

cmdutils: avtool -> fftool

2013-03-31 18:22:23 +02:00

common.mak

Integrate lcov/gcov into Libav

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

configure

lavf: add libquvi demuxer.

2013-04-10 12:09:20 +02:00

COPYING.GPLv2

Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.

2009-06-05 09:51:31 +00:00

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/avformat: factor av_guess_frame_rate() out

2013-03-29 17:40:28 +01:00

ffmpeg_opt.c

ffmpeg: use a rational for -aspect option.

2013-04-09 20:16:20 +02:00

ffmpeg.c

ffmpeg: update error message, and make use of av_err2str() to simplify

2013-04-10 18:02:00 +02:00

ffmpeg.h

ffmpeg: use a rational for -aspect option.

2013-04-09 20:16:20 +02:00

ffplay.c

ffplay: simplify video pts calculation

2013-04-08 22:21:45 +02: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

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

2013-03-28 12:12:38 +01:00

LICENSE

LICENSE: add libutvideo in the GPL libraries list.

2013-03-29 02:08:20 +01:00

MAINTAINERS

Update MAINTAINERS with information about avisynth demuxer.

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

Makefile

Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'

2013-04-06 13:23:38 +02: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.1%

Other 0.1%