ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-10 00:40:01 +01:00

Go to file

Michael Niedermayer a77a27a24b Merge commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2'

* commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2':
  libx264: change i_qfactor to use x264cli's default
  qtrle: use AV_LOG_ERROR in an error message.

Conflicts:
	libavcodec/libx264.c

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

2013-02-24 14:05:16 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

lavf/concatdec: add the "duration" directive.

2013-02-24 13:12:46 +01:00

libavcodec

Merge commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2'

2013-02-24 14:05:16 +01:00

libavdevice

v4l2: try to fix build on BSD

2013-02-18 00:53:17 +01:00

libavfilter

lavfi/formats: reindent after last commit.

2013-02-24 12:05:06 +01:00

libavformat

Merge commit '56daf10e0313c5e36f43e773f457d2a99ff0df10'

2013-02-24 13:15:59 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

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

libavutil

Merge commit 'f935aca44c674d30e3ed940ef73bbad1228a5855'

2013-02-24 12:22:51 +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

fate/subtitles: add character encoding conversion test.

2013-02-23 00:24:02 +01:00

tools

tools: add seek_print.

2013-02-24 13:12:46 +01:00

.gitignore

tools: add seek_print.

2013-02-24 13:12:46 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

blend filter

2013-02-21 20:16:23 +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 commit '8a11ce43d08352f7a290355ebb5b29c495ad9609'

2013-02-20 11:54:06 +01:00

configure

configure: Use libiconv on systems that lack built-in iconv

2013-02-21 22:41:19 +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: set resample_pix_fmt for sub2video.

2013-02-21 12:41:30 +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 89.9%

Assembly 8.1%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%