FFmpeg

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

Go to file

Michael Niedermayer 5b602a140f Merge remote-tracking branch 'luzero/pulse'

* luzero/pulse:
  pulse: cosmetics
  pulse: introduce pulseaudio input

Conflicts:
	Changelog
	configure
	libavdevice/Makefile
	libavdevice/alldevices.c

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

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

doc

deshake: add documentation in filters.texi

2011-10-21 10:02:35 +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-22 01:16:41 +02:00

libavdevice

Merge remote-tracking branch 'luzero/pulse'

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

libavfilter

lavfi: add missing header mulitple-inclusion guard in transform.h

2011-10-20 15:59:20 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2011-10-22 01:16:41 +02:00

libavutil

Merge remote-tracking branch 'qatar/master'

2011-10-22 01:16:41 +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

Merge remote-tracking branch 'qatar/master'

2011-10-22 01:16:41 +02:00

mt-work

Update todo

2011-06-12 18:01:29 +02:00

presets

Remove redundant libx264 preset files

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

tests

Merge remote-tracking branch 'qatar/master'

2011-10-22 01:16:41 +02:00

tools

Merge remote-tracking branch 'hexene/stagefright'

2011-10-13 18:04:02 +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 libswresample.

2011-09-19 07:04:17 +02:00

configure

Merge remote-tracking branch 'luzero/pulse'

2011-10-22 01:56:57 +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

doxygen: dont generate docs for avconv.c

2011-09-08 17:56:17 +02:00

ffmpeg.c

Merge remote-tracking branch 'qatar/master'

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

ffplay.c

ffplay: avoid window resize crash on osx with libsdl 1.2.14

2011-10-16 19:28:22 +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

Merge remote branch 'qatar/master'

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

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

Revert "partially rename FFmpeg to Libav"

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

RELEASE

RELEASE: 0.8.5 has been released

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

subdir.mak

Merge remote-tracking branch 'qatar/master'

2011-07-31 00:34:47 +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.

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%