ffmpeg

Go to file

Michael Niedermayer 2becf21d9f Merge commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca'

* commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca':
  tak: decode directly to the user-provided AVFrame
  smackaud: decode directly to the user-provided AVFrame
  sipr: decode directly to the user-provided AVFrame
  shorten: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/shorten.c
	libavcodec/takdec.c

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

2013-02-13 12:35:37 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

doc/demuxers: quote command line arguments with @code

2013-02-13 04:13:55 +01:00

libavcodec

Merge commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca'

2013-02-13 12:35:37 +01:00

libavdevice

lavd/v4l2: fix error logic when enumerating standards

2013-02-10 20:59:06 +01:00

libavfilter

lavfi/amerge: make description consistent with documentation

2013-02-11 14:43:23 +00:00

libavformat

WAV muxer: add RF64 support

2013-02-12 14:50:27 +00:00

libavresample

Merge remote-tracking branch 'qatar/master'

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

libavutil

Merge remote-tracking branch 'qatar/master'

2013-02-12 14:10:36 +01:00

libpostproc

Fix libpostproc compilation on x86_32 with disable-optimizations.

2013-02-09 15:03:04 +01:00

libswresample

swr: Dont use floats for S32->S32 when possible

2013-02-04 04:11:46 +01:00

libswscale

swscale: Disallow conversion to GBRP16

2013-02-11 20:03:16 +02:00

presets

presets: specify the codecs.

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

tests

swscale: Disallow conversion to GBRP16

2013-02-11 20:03:16 +02: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

WAV muxer: add RF64 support

2013-02-12 14:50:27 +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 '89f11f498b9c15bc71494a11a7ec560f4adf630d'

2013-02-06 15:57:45 +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 commit '56dea32f09e71460add14a1b6d0fbe6eb16f02a4'

2013-02-12 13:41:24 +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: dont allow -flags to override -pass

2013-02-06 01:26:26 +01:00

ffmpeg.c

ffmpeg: fix streamcopy of lsf mp3.

2013-02-12 00:38:22 +01:00

ffmpeg.h

ffmpeg: implement -force_key_frames expression evalution

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

ffplay.c

Revert "Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'"

2013-02-10 14:27:57 +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 commit '304b806cb524fb040f8e09a241040f1af2cb820b'

2013-02-12 13:26:22 +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 92.1%

Assembly 6%

Makefile 1.2%

C++ 0.3%

Objective-C 0.2%

Other 0.1%