FFmpeg

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

Go to file

Michael Niedermayer 77aedc77ab Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: Provide the right alignment for external mmx asm
  x86: Replace checks for CPU extensions and flags by convenience macros
  configure: msvc: fix/simplify setting of flags for hostcc
  x86: mlpdsp: mlp_filter_channel_x86 requires inline asm

Conflicts:
	libavcodec/x86/fft_init.c
	libavcodec/x86/h264_intrapred_init.c
	libavcodec/x86/h264dsp_init.c
	libavcodec/x86/mpegaudiodec.c
	libavcodec/x86/proresdsp_init.c
	libavutil/x86/float_dsp_init.c
	libswscale/utils.c
	libswscale/x86/swscale.c

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

2012-09-09 13:27:42 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2012-09-06 16:23:17 +02:00

doc

lavd/dshow: support video codec and pixel format selection

2012-09-07 09:59:12 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

libavdevice

dshow: Change WINBOOL to BOOL

2012-09-07 22:23:32 +02:00

libavfilter

lavfi: drop deprecated and pointless avfilter_default_end_frame() function

2012-09-09 10:57:28 +02:00

libavformat

smush: read subversion for version==1 too.

2012-09-09 02:36:57 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

libavutil

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

libpostproc

rename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT

2012-08-20 17:47:25 +02:00

libswresample

swr: add av_cold to init/free functions

2012-09-09 02:26:20 +02:00

libswscale

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

mt-work

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

presets

presets: specify the codecs.

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

tests

Merge remote-tracking branch 'qatar/master'

2012-09-08 12:53:44 +02:00

tools

Merge remote-tracking branch 'qatar/master'

2012-08-31 13:34:32 +02:00

.gitignore

gitignore: codec_names.h is no more

2012-09-07 14:59:01 +02:00

arch.mak

Optimization of AMR NB and WB decoders for MIPS

2012-06-11 21:12:39 +02:00

Changelog

lavfi: port decimate libmpcodecs filter

2012-08-31 16:04:37 +02:00

cmdutils_common_opts.h

cmdutils: add -layouts option.

2012-08-28 15:09:49 +02:00

cmdutils.c

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

cmdutils.h

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-08-30 17:28:21 +02:00

configure

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +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

Revert "partially rename FFmpeg to Libav"

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

Doxyfile

Merge remote-tracking branch 'qatar/master'

2012-08-04 23:51:43 +02:00

ffmpeg_filter.c

avoid ambigous buffersink names

2012-09-01 06:05:08 +02:00

ffmpeg_opt.c

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

ffmpeg.c

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

ffmpeg.h

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

ffplay.c

Merge remote-tracking branch 'cus/stable'

2012-09-01 14:59:08 +02:00

ffprobe.c

ffprobe: use exp2 instead of pow(2, ...)

2012-09-09 13:02:08 +02:00

ffserver.c

ffserver: fix order of evaluation bugs

2012-09-08 23:56:26 +02:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

2012-08-30 17:28:21 +02:00

LICENSE

LICENSE: correct incorrect claims on *GPL incompatibility

2012-08-16 04:47:18 +02:00

MAINTAINERS

Add CPiA video decoder

2012-08-31 00:24:11 +02:00

Makefile

Makefile: remove old codec_names.h on distclean

2012-09-07 14:59:01 +02:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: update, seem this has been forgotten

2012-07-01 21:21:07 +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%