FFmpeg

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

Go to file

Michael Niedermayer 398b9ed28f Merge commit 'c0dcf89887f7fbdd7a8502bc7c715f50157562cb'

* commit 'c0dcf89887f7fbdd7a8502bc7c715f50157562cb':
  bfin: Match DEFUN_END macros to the right functions

Conflicts:
	libavcodec/bfin/pixels_bfin.S

This bug seems not to have existed in our bfin code, thus
no change in this merge

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

2013-04-16 00:40:57 +02:00

compat

Provide local copies of AviSynth's and AvxSynth's requisite headers in compat/avisynth/.

2013-03-21 04:23:24 +01:00

doc

doc/filters: merge asplit and split documentation

2013-04-15 23:40:05 +02:00

libavcodec

dfa: support decoding version=1.0

2013-04-15 12:13:41 +02:00

libavdevice

avdevice/lavfi: add error checking for av_opt_set_int_list()

2013-04-12 20:39:07 +02:00

libavfilter

lavfi/split: fix minor documentation issues

2013-04-15 23:35:49 +02:00

libavformat

dfa: support decoding version=1.0

2013-04-15 12:13:41 +02:00

libavresample

Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'

2013-03-28 11:20:41 +01:00

libavutil

pca: use av_calloc()

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

libpostproc

lavfi/pp: switch to an AVOptions-based system.

2013-04-10 23:16:03 +02:00

libswresample

swr/rematrix: use av_calloc()

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

libswscale

sws/x86: update RENAME(rgb24toyv12)() to using the user provided rgb2yuv table

2013-04-15 21:44:50 +02:00

presets

…

tests

vf_histogram: avoid floats, unbreak fate

2013-04-15 21:44:50 +02:00

tools

Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'

2013-04-11 23:50:39 +02:00

.gitignore

Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'

2013-04-06 13:23:38 +02:00

arch.mak

…

Changelog

lavfi: port IVTC filters from vapoursynth.

2013-04-14 15:59:37 +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 if filters are sources or sinks.

2013-04-13 19:48:10 +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: rename decimate to mpdecimate.

2013-04-14 15:59:37 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb'

2013-04-12 15:19:32 +02:00

ffmpeg_opt.c

Merge commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0'

2013-04-12 15:33:37 +02:00

ffmpeg.c

ffmpeg: show error message in case of av_buffersrc_add_frame_flags() failure

2013-04-14 20:30:37 +02:00

ffmpeg.h

Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'

2013-04-11 23:50:39 +02:00

ffplay.c

ffplay: replace opaque/params for buffersinks

2013-04-12 20:39:07 +02:00

ffprobe.c

ffprobe: set writer context to 0 after allocation

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

ffserver.c

ffserver/ctime1: avoid using strcpy()

2013-03-25 23:31:34 +01:00

INSTALL

…

library.mak

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

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

LICENSE

LICENSE: add libutvideo in the GPL libraries list.

2013-03-29 02:08:20 +01:00

MAINTAINERS

MAINTAINERS: add opencl maintainer

2013-04-11 13:42:07 +02:00

Makefile

Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'

2013-04-06 13:23:38 +02:00

README

…

RELEASE

…

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.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%