FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00

Go to file

Michael Niedermayer 27e8298c03 Merge commit '94aefb1932be882fd93f66cf790ceb19ff575c19'

* commit '94aefb1932be882fd93f66cf790ceb19ff575c19':
  4xm: do not overread the source buffer in decode_p_block

Conflicts:
	libavcodec/4xm.c

The checks are replaced by av_assert0() as the conditions should
be impossible. If these asserts fail, there is a bug elsewhere

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

2013-06-13 14:10:06 +02:00

compat

os2threads: move from lavc to compat/

2013-05-28 12:49:20 +02:00

doc

lavfi/rotate: add angle command

2013-06-13 01:21:47 +02:00

libavcodec

Merge commit '94aefb1932be882fd93f66cf790ceb19ff575c19'

2013-06-13 14:10:06 +02:00

libavdevice

lavd: add xv output device

2013-05-30 10:44:54 +02:00

libavfilter

lavfi/rotate: add angle command

2013-06-13 01:21:47 +02:00

libavformat

Merge commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11'

2013-06-13 11:56:31 +02:00

libavresample

Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'

2013-05-18 11:25:58 +02:00

libavutil

fate: Add test vectors for HMAC SHA and SHA-2

2013-06-12 01:48:23 +02:00

libpostproc

postproc/postprocess_template: remove empty comments

2013-05-23 14:39:58 +02:00

libswresample

swresample/rematrix_template: Fix integer overflow in mix8to2

2013-06-10 03:03:17 +02:00

libswscale

Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper()

2013-06-11 01:14:38 +02:00

presets

presets: specify the codecs.

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

tests

tests: add filter-pixfmts-rotate test

2013-06-13 01:21:47 +02:00

tools

tools/qt-faststart: Fix unintended sign extension of current_offset

2013-06-02 23:10:44 +02:00

.gitignore

Rename ffadler to ffhash and expand it using the generic hash API

2013-05-16 17:58:56 +02:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

lavfi: add rotate filter

2013-06-13 01:21:47 +02:00

cmdutils_common_opts.h

cmdutils_common_opts: fix indention of #if

2013-04-11 16:07:46 +02:00

cmdutils.c

cmdutils: print threading capabilities for audio codecs

2013-06-07 14:24:52 +00:00

cmdutils.h

Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6'

2013-04-12 15:56:20 +02:00

common.mak

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

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

configure

require --enable-gpl for using the frei0r filter

2013-06-13 01:40:24 +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

CREDITS: redirect to Git log, remove current outdated content

2013-01-31 18:02:52 +01:00

ffmpeg_filter.c

Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'

2013-05-10 22:51:04 +02:00

ffmpeg_opt.c

ffmpeg: add -apad option which injects a apad filter only in the presence of video streams

2013-05-08 23:55:06 +02:00

ffmpeg.c

Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c'

2013-06-05 12:20:26 +02:00

ffmpeg.h

ffmpeg: add -apad option which injects a apad filter only in the presence of video streams

2013-05-08 23:55:06 +02:00

ffplay.c

Use av_log() instead of fprintf() in ffplay.

2013-06-04 19:47:56 +02:00

ffprobe.c

ffprobe: show chapter and chapter metadata information

2013-06-06 16:49:53 +02:00

ffserver.c

ffserver: fix null pointer dereference

2013-06-04 13:19:27 +02: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

require --enable-gpl for using the frei0r filter

2013-06-13 01:40:24 +02:00

MAINTAINERS

MAINTAINERS: add fingerprint of the FFmpeg release signing key

2013-06-05 23:31:19 +02:00

Makefile

Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'

2013-05-24 13:01:41 +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.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%