FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00

Go to file

Michael Niedermayer 857d7194ca Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: add a pointer for weighted prediction temporary buffer

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h

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

2012-12-07 16:29:07 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

avcodec: Fix a typo in an option description

2012-12-07 16:16:20 +01:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-12-07 16:29:07 +01:00

libavdevice

lavd/lavfi: fix float.h include.

2012-12-06 15:09:47 +01:00

libavfilter

Fix compilation with yasm 0.6.2.

2012-12-07 00:26:45 +01:00

libavformat

Merge commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333'

2012-12-07 15:52:43 +01:00

libavresample

Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'

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

libavutil

Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152'

2012-12-07 15:21:41 +01:00

libpostproc

pp: add SSE2 deInterlaceInterpolateCubic().

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

libswresample

resample: remove disabled debug code

2012-12-06 02:51:26 +01:00

libswscale

swscale: fix 12 and 14 bit YUV planar output with scaling.

2012-12-01 03:41:24 +01:00

presets

presets: specify the codecs.

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

tests

Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152'

2012-12-07 15:21:41 +01:00

tools

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

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

.gitignore

Add examples/resampling_audio to .gitignore.

2012-12-06 12:13:01 +01:00

arch.mak

Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'

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

Changelog

Changelog: add an entry for deprecating the avconv -vol option

2012-12-06 11:33:38 -05:00

cmdutils_common_opts.h

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

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

cmdutils.c

Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'

2012-12-05 15:58:07 +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

Merge remote-tracking branch 'qatar/master'

2012-12-04 14:23:22 +01:00

COPYING.GPLv2

Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.

2009-06-05 09:51:31 +00:00

COPYING.GPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

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

COPYING.LGPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

CREDITS

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01:00

ffmpeg_filter.c

Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'

2012-12-06 15:55:47 +01:00

ffmpeg_opt.c

ffmpeg: use avformat_seek_file() instead of av_seek_frame().

2012-12-02 00:06:02 +01:00

ffmpeg.c

ffmpeg: small indent fix.

2012-12-04 16:40: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

Merge remote-tracking branch 'qatar/master'

2012-11-29 14:22:58 +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.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%