FFmpeg

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

Go to file

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

* qatar/master:
  adpcm: use sign_extend()
  mpeg12: fix mpeg_decode_slice context parameter type
  Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context"

Conflicts:
	libavcodec/mpeg12.c
	libavcodec/mpeg12.h

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

2011-10-24 23:45:44 +02:00

doc

lavfi: rewrite nullsrc using the code in vsrc_testsrc.c

2011-10-24 17:46:48 +02:00

ffpresets

Merge remote-tracking branch 'qatar/master'

2011-10-20 02:34:51 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2011-10-24 23:45:44 +02:00

libavdevice

pulse: fix application name

2011-10-22 02:11:50 +02:00

libavfilter

vsrc_testsrc: increase log level from DEBUG to INFO for message in init()

2011-10-24 17:47:59 +02:00

libavformat

mpegts: add BDMV secondary audio stream types

2011-10-24 18:47:21 +02:00

libavutil

Check for cbrtf() and provide fallback

2011-10-22 19:49:27 +02:00

libpostproc

postproc: fix compilation failure, now really

2011-09-24 01:51:35 +02:00

libswresample

swr: Fix swresample.c:293:5: warning: passing argument 2 of ‘fill_audiodata’ from incompatible pointer type

2011-10-21 00:36:00 +02:00

libswscale

sws: replace long by x86_reg in x86 asm

2011-10-24 12:23:51 +02:00

mt-work

…

presets

Remove redundant libx264 preset files

2011-10-22 01:32:10 +02:00

tests

Merge remote-tracking branch 'qatar/master'

2011-10-23 05:13:56 +02:00

tools

tools: add a tool for enumerating/printing AVOptions in texinfo format

2011-10-24 14:18:07 +02:00

.gitignore

gitignore: add libswresample*

2011-09-19 17:39:38 +02:00

avconv.c

Merge remote-tracking branch 'qatar/master'

2011-10-20 02:34:51 +02:00

Changelog

Merge remote-tracking branch 'luzero/pulse'

2011-10-22 01:56:57 +02:00

cmdutils_common_opts.h

cmdutils: Fix loglevel for -debug

2011-10-14 02:18:55 +02:00

cmdutils.c

cmdutils: Fix loglevel for -debug

2011-10-14 02:18:55 +02:00

cmdutils.h

cmdutils.h: Project name cleanup

2011-10-14 02:18:55 +02:00

common.mak

Add rule for compiling to asm

2011-10-22 20:49:24 +02:00

configure

Check for cbrtf() and provide fallback

2011-10-22 19:49:27 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

Doxyfile

…

ffmpeg.c

Merge remote-tracking branch 'qatar/master'

2011-10-20 02:34:51 +02:00

ffplay.c

Merge remote-tracking branch 'qatar/master'

2011-10-23 05:13:56 +02:00

ffprobe.c

ffprobe: prefer av_freep() over av_free() for global print_format option.

2011-10-18 19:11:05 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2011-10-20 02:34:51 +02:00

INSTALL

…

LICENSE

libaac+ support

2011-09-26 02:28:21 +02:00

MAINTAINERS

Add libmodplug support.

2011-10-04 22:36:33 +02:00

Makefile

Merge remote-tracking branch 'qatar/master'

2011-10-20 02:34:51 +02:00

README

…

RELEASE

RELEASE: 0.8.5 has been released

2011-10-03 23:32:22 +02:00

subdir.mak

Add rule for compiling to asm

2011-10-22 20:49:24 +02:00

version.sh

…

README

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.

Languages

C 90.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%