FFmpeg

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

Go to file

Michael Niedermayer 7dc0ed80e8 Merge commit '1f3f896564501c23b44fcf605567c78ce066b539'

* commit '1f3f896564501c23b44fcf605567c78ce066b539':
  fate: Add dependencies for Vorbis, ProRes, QTRLE, utvideo tests
  fate: real: Add dependencies
  fate: lossless-audio: Add dependencies
  x86: h264dsp: Fix linking with yasm and optimizations disabled

Conflicts:
	libavcodec/x86/h264dsp_init.c
	tests/fate/lossless-audio.mak
	tests/fate/real.mak

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

2012-11-29 13:35:56 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +02:00

doc

doc/Makefile: rework component configuration logic

2012-11-29 10:19:52 +01:00

libavcodec

Merge commit '1f3f896564501c23b44fcf605567c78ce066b539'

2012-11-29 13:35:56 +01:00

libavdevice

dshow: Use NO_DSHOW_STRSAFE for all dshow header inclusions

2012-11-16 19:26:13 +01:00

libavfilter

lavfi/concat: prefer av_asprintf() over stack allocated buffer.

2012-11-29 12:55:56 +01:00

libavformat

Vivo demuxer

2012-11-28 20:13:05 +00:00

libavresample

Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'

2012-11-28 13:27:18 +01:00

libavutil

Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1'

2012-11-28 13:32:17 +01:00

libpostproc

pp: add SSE2 deInterlaceInterpolateCubic().

2012-11-18 16:21:59 +01:00

libswresample

swr: include stdint.h instead of inttypes.h.

2012-11-20 21:53:06 +01:00

libswscale

lsws: define version in SWScaler class

2012-11-29 10:20:21 +01:00

presets

presets: specify the codecs.

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

tests

Merge commit '1f3f896564501c23b44fcf605567c78ce066b539'

2012-11-29 13:35:56 +01:00

tools

Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h

2012-11-13 13:21:21 +00:00

.gitignore

.gitignore: ignore *.3 files as well

2012-11-06 12:24:12 +01:00

arch.mak

Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'

2012-10-13 15:25:11 +02:00

Changelog

ADPCM IMA Dialogic decoder

2012-11-24 10:56:47 +00:00

cmdutils_common_opts.h

Revert "cmdutils: allow specifying the file for -report"

2012-11-04 10:47:52 +01:00

cmdutils.c

replace av_log(0, by av_log(NULL,

2012-11-23 18:10:02 +01:00

cmdutils.h

Revert "cmdutils: allow specifying the file for -report"

2012-11-04 10:47:52 +01:00

common.mak

Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'

2012-11-23 13:30:51 +01:00

configure

configure: Enable avconv filter dependencies automatically

2012-11-27 17:05:01 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

ffmpeg: fix swr filter_type for auto inserted aresample filters

2012-11-26 04:06:19 +01:00

ffmpeg_opt.c

ffmpeg: fix swr filter_type for auto inserted aresample filters

2012-11-26 04:06:19 +01:00

ffmpeg.c

ffmpeg: fix mixed declarations and statements.

2012-11-24 03:02:11 +01:00

ffmpeg.h

ffmpeg: fix swr filter_type for auto inserted aresample filters

2012-11-26 04:06:19 +01:00

ffplay.c

ffplay: increase maximum frame duration to 1 hour for streams without TS discontinuity

2012-11-28 21:39:50 +01:00

ffprobe.c

ffprobe: free dictionary in opt_show_entries()

2012-11-23 18:49:26 +01:00

ffserver.c

ffserver remove CONFIG_NOCUTILS check

2012-11-27 14:41:41 +01:00

INSTALL

Merge remote branch 'qatar/master'

2011-04-08 02:50:13 +02:00

library.mak

Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'

2012-11-23 13:30:51 +01:00

LICENSE

lavfi: add geq filter.

2012-11-11 23:12:54 +01:00

MAINTAINERS

MAINTAINERS: fix entry for img2

2012-11-06 01:46:21 +01:00

Makefile

Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'

2012-11-23 13:30:51 +01:00

README

README: be a tiny bit more verbose

2012-04-06 10:23:26 +02:00

RELEASE

Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'

2012-10-24 14:01:36 +02: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%