FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Go to file

Michael Niedermayer 6635b13411 Merge commit '91a6944e56236234f0a7ba162404665753cbcb51'

* commit '91a6944e56236234f0a7ba162404665753cbcb51':
  vmd: use the PALETTE_COUNT constant uniformly

Conflicts:
	libavcodec/vmdav.c

No change as the changed line does not exist in ffmpegs vmdav.c

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

2013-05-30 09:28:23 +02:00

compat

os2threads: move from lavc to compat/

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

doc

Merge remote-tracking branch 'qatar/master'

2013-05-29 11:19:25 +02:00

libavcodec

libavcodec/smvjpegdec: pass flags / idct algo into jpeg avctx

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

libavdevice

v4l2: make possible to disable libv4l2 at runtime.

2013-05-22 19:49:29 +02:00

libavfilter

lavfi/noise: fix out of array access

2013-05-29 16:54:28 +00:00

libavformat

avformat/mov: Try to detect and support files with invalid sample sizes

2013-05-30 00:32:36 +02:00

libavresample

Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'

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

libavutil

Add AV_HASH_MAX_SIZE.

2013-05-29 22:31:16 +02:00

libpostproc

postproc/postprocess_template: remove empty comments

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

libswresample

swr/rematrix: use av_calloc()

2013-04-15 20:31:06 +02:00

libswscale

add YUVJ411P

2013-05-21 12:56:11 +02:00

presets

presets: specify the codecs.

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

tests

fate: fix smvjpeg test

2013-05-30 03:31:04 +02:00

tools

tools/patcheck: fix misdetection with stuff like const_names

2013-05-23 19:11:28 +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 '2d2d6a4883479403798f4ed46941d5b365823570'

2013-05-29 10:40:42 +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

Integrate lcov/gcov into Libav

2013-04-05 18:55:11 +02:00

configure

Merge commit '9f30fb5a773d59298d8d45c741b3fd971d84c97b'

2013-05-29 11:06:26 +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: use actual packet pts when discarding for the copypriorss option

2013-05-28 17:03:23 -04: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

ffplay: dont forget passing lowres to private options

2013-05-28 00:09:34 +02:00

ffprobe.c

ffprobe: set writer context to 0 after allocation

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

ffserver.c

ffserver: replace atoll() by strtoll()

2013-05-19 11:13:07 +02:00

INSTALL

…

library.mak

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

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

LICENSE

lavfi: port wavelet denoiser filter from libmpcodecs.

2013-05-16 00:45:45 +02:00

MAINTAINERS

Support playing SMV files.

2013-05-22 15:20:22 +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

…

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%