FFmpeg

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

Go to file

Michael Niedermayer 2fc7c818cb Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: fix build with nasm 2.08
  x86: use nop cpu directives only if supported
  x86: fix rNmp macros with nasm
  build: add trailing / to yasm/nasm -I flags
  x86: use 32-bit source registers with movd instruction
  x86: add colons after labels

Conflicts:
	Makefile
	libavutil/x86/x86inc.asm

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

2012-08-07 23:04:55 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2012-07-12 23:57:00 +02:00

doc

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-08-07 23:04:55 +02:00

libavdevice

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

libavfilter

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

libavformat

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

libavresample

Merge remote-tracking branch 'qatar/master'

2012-08-07 23:04:55 +02:00

libavutil

Merge remote-tracking branch 'qatar/master'

2012-08-07 23:04:55 +02:00

libpostproc

pp: check that the argument is not NULL as this is not supported

2012-07-07 19:14:21 +02:00

libswresample

swr: fix 10l typo mixing in and out config.

2012-08-01 21:18:03 +02:00

libswscale

Merge remote-tracking branch 'qatar/master'

2012-08-04 23:51:43 +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-08-06 22:22:37 +02:00

tools

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

.gitignore

tools/bisect: rename temporary file and add it to git ignore

2012-07-07 13:15:01 +02:00

arch.mak

Optimization of AMR NB and WB decoders for MIPS

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

Changelog

lavfi: add smptebars source

2012-08-07 20:06:56 +02:00

cmdutils_common_opts.h

cmdutils: fix -fdebug without -v xy

2012-04-05 21:50:50 +02:00

cmdutils.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

cmdutils.h

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

common.mak

Merge remote-tracking branch 'qatar/master'

2012-08-07 23:04:55 +02:00

configure

Merge remote-tracking branch 'qatar/master'

2012-08-07 23:04:55 +02: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

Doxyfile

Merge remote-tracking branch 'qatar/master'

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

ffmpeg.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

ffplay.c

ffplay: fix warning that i just mistakenly introduced

2012-07-20 03:47:11 +02:00

ffprobe.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

ffserver.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

build: Fix some paths in uninstall-libs

2012-08-07 22:34:10 +02:00

LICENSE

LICENSE: Document all GPL files

2012-08-04 04:03:08 +02:00

MAINTAINERS

Canopus Lossless decoder

2012-08-01 22:02:19 -04:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-08-06 22:22:37 +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%