FFmpeg

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

Go to file

Michael Niedermayer cd8cb54990 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ARM: ac3dsp: optimised update_bap_counts()
  mpegaudiodec: Fix av_dlog() invocation.
  h264/10bit: add HAVE_ALIGNED_STACK checks.
  Update 8-bit H.264 IDCT function names to reflect bit-depth.
  Add IDCT functions for 10-bit H.264.
  mpegaudioenc: Fix broken av_dlog statement.
  Employ correct printf format specifiers, mostly in debug output.
  ARM: fix MUL64 inline asm for pre-armv6

Conflicts:
	libavcodec/mpegaudioenc.c
	libavformat/ape.c
	libavformat/mxfdec.c
	libavformat/r3d.c

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

2011-06-02 05:12:10 +02:00

doc

doc/examples: give meaningful names to the example files

2011-06-01 13:02:08 +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-06-02 05:12:10 +02:00

libavdevice

v4l2: rewrite code iterating the supported standards

2011-05-30 09:08:42 +02:00

libavfilter

Merge remote-tracking branch 'qatar/master'

2011-06-02 05:12:10 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2011-06-02 05:12:10 +02:00

libavutil

Merge remote-tracking branch 'qatar/master'

2011-05-31 02:08:20 +02:00

libpostproc

postprocess.c: filter name needs to be double 0 terminated

2011-05-31 17:50:46 +02:00

libswscale

swscale: fix compilation of bfin due to missing pixdesc.h header

2011-06-01 13:30:35 +02:00

mt-work

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

2011-05-31 03:10:35 +02:00

tests

swscale: dont loose precission on RGB/BGR48 input, that is dont drop half the bits.

2011-05-27 13:21:17 +02:00

tools

Merge remote branch 'qatar/master'

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

.gitignore

Merge remote-tracking branch 'qatar/master'

2011-05-20 05:48:22 +02:00

Changelog

Merge remote-tracking branch 'qatar/master' into master

2011-05-29 03:34:35 +02:00

cmdutils_common_opts.h

cmdutils: remove OPT_FUNC2

2011-05-28 18:23:05 +02:00

cmdutils.c

cmdutils: remove OPT_FUNC2

2011-05-28 18:23:05 +02:00

cmdutils.h

cmdutils: remove OPT_FUNC2

2011-05-28 18:23:05 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2011-05-30 01:29:11 +02:00

configure

Merge remote-tracking branch 'qatar/master'

2011-05-30 01:29:11 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

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

ffmpeg: handle copy of packets for AVFMT_RAWPICTURE output formats

2011-06-01 13:04:53 +02:00

ffplay.c

Fix various unused variable warnings

2011-05-30 00:24:01 +02:00

ffprobe.c

cmdutils: remove OPT_FUNC2

2011-05-28 18:23:05 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2011-05-27 02:53:21 +02:00

ffserver.h

multiple inclusion guard cleanup

2011-05-21 13:48:10 +02: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-30 01:29:11 +02:00

README

Revert "partially rename FFmpeg to Libav"

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

subdir.mak

Remove avconfig.h and INCINSTDIRs on uninstall.

2011-05-24 10:09:45 +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.2%

Other 0.1%