FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00

Go to file

Michael Niedermayer 30b491f1c9 Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e'

* commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e':
  movenc: Keep track of the allocated size for the cluster array
  mem: Add av_realloc_array and av_reallocp_array

Conflicts:
	doc/APIchanges
	libavformat/movenc.c
	libavutil/mem.c
	libavutil/mem.h
	libavutil/version.h

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

2013-06-05 11:19:16 +02:00

compat

os2threads: move from lavc to compat/

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

doc

Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e'

2013-06-05 11:19:16 +02:00

libavcodec

pngdec: dont treat mpng like png with key and non keyframes

2013-06-04 20:40:07 +02:00

libavdevice

lavd: add xv output device

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

libavfilter

lavfi/mp: remove mp=sab

2013-06-05 00:06:51 +02:00

libavformat

Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e'

2013-06-05 11:19:16 +02:00

libavresample

Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'

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

libavutil

Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e'

2013-06-05 11:19:16 +02:00

libpostproc

postproc/postprocess_template: remove empty comments

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

libswresample

swr: dont treat 32 and 24 as equal in simple copy check

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

libswscale

Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a'

2013-06-03 11:53:05 +02:00

presets

presets: specify the codecs.

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

tests

avcodec/jpeg2000dwt: merge rescaling with interleave in 9/7 int IDWT

2013-06-03 13:24:20 +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

Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c'

2013-06-03 12:47:26 +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 slice threading flag in -filters.

2013-05-24 15:34:37 +02: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

lavfi: port sab filter from libmpcodecs

2013-06-05 00:06:51 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

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

ffmpeg: ignore EOF when pushing frames to filters.

2013-06-02 23:19:42 +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: set writer context to 0 after allocation

2013-03-19 18:00:34 +01:00

ffserver.c

ffserver: fix null pointer dereference

2013-06-04 13:19:27 +02:00

INSTALL

…

library.mak

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

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

LICENSE

lavfi: port sab filter from libmpcodecs

2013-06-05 00:06:51 +02:00

MAINTAINERS

tta encoder

2013-06-02 15:16:52 +00:00

Makefile

Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'

2013-05-24 13:01:41 +02:00

README

…

RELEASE

RELEASE: 1.1.git for master

2013-01-06 21:42:35 +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.7%

Assembly 8.2%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%