ffmpeg

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-10 16:15:39 +01:00

Go to file

Michael Niedermayer 1fabe4ae8c Merge commit 'f1a2364cebe472a98a5ea157071f4eee4429ce9f' into release/1.1

* commit 'f1a2364cebe472a98a5ea157071f4eee4429ce9f':
  Update Changelog for 9.12

Conflicts:
	Changelog

Not merged, as the changelog does not apply to FFmpeg like this

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

2014-04-21 14:19:46 +02:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

update for 1.1.9

2014-03-07 04:14:03 +01:00

libavcodec

Merge commit '7a2254ab26b24255a4d6ea476ba5fd38525a9bb3' into release/1.1

2014-04-21 13:55:37 +02:00

libavdevice

avdevice/v4l2: only use average frame rate if set

2014-03-07 04:04:07 +01:00

libavfilter

configure: Special case libfreetype test

2014-04-21 14:05:30 +02:00

libavformat

avformat/mov: fix keyframe flags for sample from chromium Issue 340865

2014-03-24 23:38:13 +01:00

libavresample

Merge commit '65830277d2d2ee3658e1f070a61044fff261ed3e' into release/1.1

2014-01-12 16:51:26 +01:00

libavutil

avutil/log: skip IO calls on empty strings

2014-03-07 04:04:07 +01:00

libpostproc

build: postproc cleanup.

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

libswresample

swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output

2013-08-20 18:45:21 +02:00

libswscale

Merge commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb' into release/1.1

2013-05-12 14:31:59 +02:00

presets

…

tests

Merge commit '56eded8bc7bccdf14245bae3a45b0fecf9d9d122' into release/1.1

2013-12-21 02:31:41 +01:00

tools

Merge commit 'cb95c1935f43ee6ae7fd15439df0f674e809f180' into release/1.1

2014-04-21 13:32:22 +02:00

.gitignore

Add examples/resampling_audio to .gitignore.

2012-12-06 12:13:01 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

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

cmdutils.c

cmdutils: update year

2014-02-04 04:50:17 +01:00

cmdutils.h

cmdutils: avtool -> fftool

2013-05-13 00:45:09 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

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

configure

configure: Special case libfreetype test

2014-04-21 14:05:30 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

ffmpeg: sub2video: set resample size.

2013-01-01 23:06:34 +01:00

ffmpeg_opt.c

ffmpeg: dont allow -flags to override -pass

2013-02-06 02:03:05 +01:00

ffmpeg.c

Merge commit 'fa6eef4210c2fd7f7324d558b09311c75987a31e' into release/1.1

2013-08-27 16:30:57 +02:00

ffmpeg.h

Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

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

ffplay.c

Replace references to "que" with the appropriate word.

2013-01-03 00:21:47 +01:00

ffprobe.c

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

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

ffserver.c

ffserver: strip odd chars from html error messages before sending them back

2013-10-09 00:55:38 +02:00

INSTALL

…

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: mention that people are welcome to pick up and maintain older releases

2013-03-18 03:35:47 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

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

README

…

RELEASE

update for 1.1.9

2014-03-07 04:14:03 +01:00

VERSION

update for 1.1.9

2014-03-07 04:14:03 +01:00

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.8%

Assembly 8.2%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%