ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-22 22:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,952 Commits 36 Branches 398 Tags 535 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
48706f41e1
Go to file
Michael Niedermayer 48706f41e1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpeg12: check for available bits to avoid an infinite loop
  fate: add some shorthands to run groups of tests
  fate: Give some tests more sensible names.
  cosmetics: Rename ffsink to avsink.

Conflicts:
	avconv.c
	cmdutils.c
	cmdutils.h
	ffmpeg.c
	ffplay.c
	tests/fate/audio.mak
	tests/fate/demux.mak
	tests/fate/dpcm.mak
	tests/fate/image.mak
	tests/fate/lossless-audio.mak
	tests/fate/lossless-video.mak
	tests/fate/microsoft.mak
	tests/fate/pcm.mak
	tests/fate/real.mak
	tests/fate/screen.mak
	tests/fate/video.mak
	tests/fate/voice.mak
	tests/fate/wma.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-20 02:14:54 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-01-20 02:14:54 +01:00
libavdevice Revert "v4l2: poll the file descriptor" 2012-01-11 14:57:56 +01:00
libavfilter lavfi: add missing periods in descriptions. 2012-01-20 00:16:27 +01:00
libavformat Add "S263" FourCC 2012-01-19 17:20:50 +01:00
libavutil tools: add ffeval tool 2012-01-17 12:10:07 +01:00
libpostproc pp: bump major in git master to match what debian contains. 2012-01-18 21:21:05 +01:00
libswresample libswresample: introduce int swr_set_compensation() instead of void swr_compensate() 2012-01-09 04:16:06 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-01-15 01:16:54 +01: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' 2012-01-20 02:14:54 +01:00
tools tools: add ffeval tool 2012-01-17 12:10:07 +01:00
.gitignore doc: fate: Support building a plain text version 2011-12-20 16:05:01 +01:00
avconv.c cosmetics: Rename ffsink to avsink. 2012-01-19 00:19:43 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2012-01-17 02:37:30 +01:00
cmdutils_common_opts.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
cmdutils.c cmdutils: include type in filter list. 2012-01-19 23:33:17 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure libcelt: configure: check for recent version. 2012-01-19 19:47:08 +01: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 Fix a bunch of platform name and other typos. 2012-01-11 13:48:30 +01:00
ffmpeg.c cosmetics: Rename ffsink to avsink. 2012-01-19 00:19:43 +01:00
ffplay.c ffplay: mark i variable in toggle_full_screen() as unused 2012-01-15 14:51:59 +01:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-01-13 01:29:48 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS MAINTAINERS: update release maintainers 2012-01-02 16:01:33 +01:00
Makefile Makefile: fix path to ffprobe.xsd 2011-12-27 22:29:40 +01:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01: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.