FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00

Go to file

Michael Niedermayer afb3fb3352 Merge commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9'

* commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9':
  asrc_anullsrc: do not set samplerate and channel layout explicitly

Conflicts:
	libavfilter/asrc_anullsrc.c

No change to FFmpeg due to semantic difference between the filter sources

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

2013-03-16 16:56:30 +01:00

compat

Use the avstring.h locale-independent character type functions

2013-03-07 15:16:36 +02:00

doc

Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'

2013-03-16 16:09:37 +01:00

libavcodec

Merge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6'

2013-03-16 14:10:09 +01:00

libavdevice

lavd/v4l2: silence libv4l2 logging

2013-03-16 02:44:36 +01:00

libavfilter

Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'

2013-03-16 16:38:11 +01:00

libavformat

Merge commit 'aa3c77998404cc32233cb76e961ca27db8565459'

2013-03-16 15:38:13 +01:00

libavresample

Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'

2013-02-24 17:45:06 +01:00

libavutil

Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'

2013-03-16 16:38:11 +01:00

libpostproc

Fix libpostproc compilation on x86_32 with disable-optimizations.

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

libswresample

buildsys: only include log2_tab per library for shared builds

2013-03-04 12:25:02 +01:00

libswscale

Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'

2013-03-12 15:44:15 +01:00

presets

…

tests

fate: test both direct and indirect paths in delogo filter.

2013-03-16 16:22:56 +01:00

tools

Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'

2013-03-16 16:09:37 +01:00

.gitignore

tools: add seek_print.

2013-02-24 13:12:46 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

lavfi: add perms and aperms filters.

2013-03-16 16:04:59 +01:00

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

2012-12-20 02:38:18 +01:00

cmdutils.c

opt: re-enable memleak fix for duplicated options.

2013-03-13 07:25:16 +01:00

cmdutils.h

Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'

2013-03-12 18:10:35 +01:00

common.mak

Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74'

2013-02-24 15:24:38 +01:00

configure

lavc: make compilation of frame_thread_encoder.o optional.

2013-03-14 15:04:17 +01: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

Remove references to the "ff" variant of buffersink.

2013-03-12 23:31:07 +01:00

ffmpeg_opt.c

Merge commit '3e175a2a550f5c2f788e8cd969052e10a5025a27'

2013-03-15 12:54:05 +01:00

ffmpeg.c

ffmpeg: remove unused variable

2013-03-12 18:58:10 +01:00

ffmpeg.h

Merge commit '354468fc12dcf93e7fb4af552e18906771913273'

2013-03-12 14:16:02 +01:00

ffplay.c

Merge commit '2eaa3663fda750dac66d41fe8541a8744d5563a4'

2013-03-13 01:31:46 +01:00

ffprobe.c

ffprobe: support codec options

2013-03-13 00:34:36 +01:00

ffserver.c

opt: re-enable memleak fix for duplicated options.

2013-03-13 07:25:16 +01:00

INSTALL

…

library.mak

build: fixes a "can't cd to..." issue when installing shared libraries.

2013-02-15 08:39:35 +01:00

LICENSE

lavfi: port MP stereo3d filter

2013-03-05 18:36:40 +00:00

MAINTAINERS

MAINTAINERS: mention that people are welcome to pick up and maintain older releases

2013-03-14 14:50:42 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01: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 90.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%