RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 08:12:44 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
33,931 Commits 37 Branches 400 Tags 244 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
5b602a140f
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
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
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
.gitignore
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.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'luzero/pulse' 2011-10-22 01:56:57 +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
ffprobe.c
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
INSTALL
LICENSE
MAINTAINERS
Makefile Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
README
RELEASE
subdir.mak
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.