FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00

Go to file

Michael Niedermayer 3c7650a83d Merge remote-tracking branch 'qatar/master'

This early morning merge should fix --disable-yasm

* qatar/master:
  Clean up #includes in cmdutils.h.
  g729: Merge g729.h into g729dec.c.
  10l: wrap float_interleave functions in HAVE_YASM.

Conflicts:
	libavcodec/g729.h

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

2011-05-19 13:00:31 +02:00

doc

Merge remote-tracking branch 'qatar/master'

2011-05-19 06:00:31 +02:00

ffpresets

Merge remote-tracking branch 'qatar/master'

2011-05-18 05:42:42 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2011-05-19 13:00:31 +02:00

libavdevice

Merge remote branch 'qatar/master'

2011-05-13 04:40:40 +02:00

libavfilter

Add some forgotten const to function arguments in libavfilter & libavformat.

2011-05-17 03:05:36 +02:00

libavformat

av_find_stream_info: Print more details about max anaylize duration failures.

2011-05-19 03:45:00 +02:00

libavutil

eval: opensolaris strtod() cannot handle 0x1234

2011-05-18 00:01:40 +02:00

libpostproc

Merge remote branch 'qatar/master'

2011-05-09 04:50:56 +02:00

libswscale

swscale: fix compile on mingw32

2011-05-14 13:22:46 +02:00

mt-work

Merge remote-tracking branch 'ffmpeg-mt/master'

2011-03-30 02:58:38 +02:00

tests

Merge remote-tracking branch 'qatar/master'

2011-05-19 06:00:31 +02:00

tools

Merge remote branch 'qatar/master'

2011-05-17 04:51:33 +02:00

.gitignore

Remove stray libavcore and _g binary references.

2011-04-23 14:23:20 +02:00

Changelog

update changelog with 9/10 bit H264 and FFV1 changes

2011-05-16 23:30:41 -04:00

cmdutils_common_opts.h

Implement a -pix_fmts option for listing all the supported pixel

2009-12-21 21:53:03 +00:00

cmdutils.c

cmdutils: Allocate private decoder context if its not allocated yet.

2011-05-16 21:26:18 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2011-05-19 13:00:31 +02:00

common.mak

Merge remote-tracking branch 'newdev/master'

2011-04-01 02:58:15 +02:00

configure

configure: favor pkg_config over sdl_config

2011-05-18 17:17:56 +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

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

2009-06-05 09:51:31 +00: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 'newdev/master'

2011-03-19 20:05:11 +01:00

ffmpeg.c

Add support for request_sample_format in ffmpeg and ffplay.

2011-05-18 17:27:06 -04:00

ffplay.c

Add support for request_sample_format in ffmpeg and ffplay.

2011-05-18 17:27:06 -04:00

ffprobe.c

ffprobe: tweak error message in open_input_file()

2011-05-12 13:03:10 +02:00

ffserver.c

Merge remote branch 'qatar/master'

2011-05-13 04:40:40 +02:00

ffserver.h

Add FFMPEG_ prefix to all multiple inclusion guards.

2007-10-17 09:37:46 +00:00

INSTALL

Merge remote branch 'qatar/master'

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

LICENSE

Revert "partially rename FFmpeg to Libav"

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

MAINTAINERS

add MicroDVD muxer and demuxer

2011-04-04 01:29:40 +02:00

Makefile

Merge remote-tracking branch 'qatar/master'

2011-05-19 06:00:31 +02:00

README

Revert "partially rename FFmpeg to Libav"

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

subdir.mak

Revert "Remove support for stripping executables"

2011-04-01 00:24:12 +02:00

version.sh

Merge remote-tracking branch 'newdev/master'

2011-03-19 20:05:11 +01:00

README

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.

Languages

C 90.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.1%

Other 0.1%