ffmpeg

Go to file

Michael Niedermayer 93f80cf2cc Merge commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb' into release/1.1

* commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb':
  lavc: Fix assignments in if() when calling ff_af_queue_add
  wav: Always seek to an even offset
  swscale: Use alpha from the right row in yuva2rgba_c
  Prepare for 9.6 Release

Conflicts:
	RELEASE

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

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

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

update for 1.1.4

2013-03-14 17:39:57 +01:00

libavcodec

Merge commit '0662967d2bbdbe90540eaa8c847f521fa4b75aab' into release/1.1

2013-05-12 14:25:50 +02:00

libavdevice

Merge remote-tracking branch 'qatar/release/9' into release/1.1

2013-01-19 15:54:36 +01:00

libavfilter

Merge commit '0662967d2bbdbe90540eaa8c847f521fa4b75aab' into release/1.1

2013-05-12 14:25:50 +02:00

libavformat

Merge commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb' into release/1.1

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

libavresample

Merge remote-tracking branch 'qatar/release/9' into release/1.1

2013-02-05 16:28:36 +01:00

libavutil

Merge commit 'c50241080d7599c90fc8b4e74c5f8d62a4caae52' into release/1.1

2013-03-18 03:05:36 +01:00

libpostproc

build: postproc cleanup.

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

libswresample

buildsys: only include log2_tab per library for shared builds

2013-03-05 01:17:55 +01:00

libswscale

Merge commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb' into release/1.1

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

presets

presets: specify the codecs.

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

tests

fate: fetch samples that match the release series

2013-03-23 14:45:01 +01:00

tools

Fix "knwon" typo and add a check in tools/patcheck

2013-01-04 19:24:37 +00: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

Changelog

Merge commit '46fd6e4f2ebbcd5a00847cdb05fe416466d06d37' into release/1.1

2013-05-12 14:11:03 +02: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 'b7765d00f911fe0f8fcda21b93a540f27d2ba2f5' into release/1.1

2013-02-14 13:14:54 +01:00

cmdutils.h

Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'

2012-12-20 12:06:15 +01:00

common.mak

Merge remote-tracking branch 'qatar/master'

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

configure

Merge commit '05015d03da1d745bb92915b5cea92dec16af719f' into release/1.1

2013-05-12 12:49:36 +02: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

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01:00

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

ffmpeg: do not call exit from exit_program()

2013-02-06 04:15:48 +01: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: 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: 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

README: be a tiny bit more verbose

2012-04-06 10:23:26 +02:00

RELEASE

Prepare for 9.6 Release

2013-05-04 10:54:29 +02:00

VERSION

update for 1.1.4

2013-03-14 17:39:57 +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 92.1%

Assembly 6%

Makefile 1.2%

C++ 0.3%

Objective-C 0.2%

Other 0.1%