videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity
39,476 Commits 36 Branches 392 Tags 201 MiB
C 90.3%
Assembly 7.7%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
Go to file
Michael Niedermayer 49891784ce Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vsrc_buffer: allow buffering arbitrary number of frames.
  vf_scale: avoid a pointless memcpy in no-op conversion.
  avfiltergraph: try to reduce format conversions in filters.
  avfiltergraph: add an AVClass to AVFilterGraph on next major bump.
  id3v2: fix skipping extended header in id3v2.4

Conflicts:
	libavfilter/vf_scale.c
	libavfilter/vsrc_buffer.c
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-04-02 00:17:02 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-03-30 22:10:17 +02:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec snow-test: fix pointer type warnings 2012-04-01 22:28:24 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-04-02 00:17:02 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-04-02 00:17:02 +02:00
libavutil The lt and lte functions were swapped. 2012-04-01 11:01:08 +02:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample swr-test: remove unused variable 2012-04-01 22:24:06 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +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 The lt and lte functions were swapped. 2012-04-01 11:01:08 +02:00
tools Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-03-25 23:10:30 +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 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01: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
Changelog XBM decoder 2012-03-27 20:08:41 +02:00
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE Remove libpostproc. 2012-02-23 19:36:16 +01:00
MAINTAINERS ZeroCodec Decoder 2012-03-19 00:19:13 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
RELEASE RELEASE: bump to current version (0.10.2). 2012-03-26 22:47:28 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure Merge remote-tracking branch 'qatar/master' 2012-03-30 22:10:17 +02:00
ffmpeg.c ffmpeg: fix plain -profile support 2012-04-01 20:48:20 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +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.