RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
36,242 Commits 37 Branches 400 Tags 254 MiB
C 90.2%
Assembly 7.9%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
Go to file
Michael Niedermayer 6071e4d87a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  v410dec: Check for sufficient input data. Fixes crash
  fate: Add v210 codec regression tests
  mpegts: adjustable minimum PES payload
  mpegts: properly output large audio packets
  avformat: Add SMJPEG demuxer.
  Indeo 4 decoder

Conflicts:
	doc/general.texi
	libavcodec/v410dec.c
	libavcodec/version.h
	libavformat/mpegtsenc.c
	libavformat/smjpeg.c
	libavformat/version.h
	tests/codec-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2011-12-29 01:40:34 +01:00
doc Merge remote-tracking branch 'qatar/master' 2011-12-29 01:40:34 +01:00
ffpresets
…
libavcodec Merge remote-tracking branch 'qatar/master' 2011-12-29 01:40:34 +01:00
libavdevice v4l2: remove unneded linux specific asm/types.h include 2011-12-27 16:07:58 +01:00
libavfilter lavfi: add asplit filter 2011-12-27 15:21:08 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-12-29 01:40:34 +01:00
libavutil mem: add av_max_alloc() to limit the maximum amount that may be allocated in one piece 2011-12-25 18:55:43 +01:00
libpostproc libpostproc: increase LIBPOSTPROC_VERSION_MICRO to 100 2011-12-22 03:07:13 +01:00
libswresample swr: fix swresample_version() 2011-12-23 23:26:02 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-12-27 01:19:18 +01:00
mt-work
…
presets
…
tests Merge remote-tracking branch 'qatar/master' 2011-12-29 01:40:34 +01:00
tools Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
.gitignore doc: fate: Support building a plain text version 2011-12-20 16:05:01 +01:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
…
Changelog Merge remote-tracking branch 'qatar/master' 2011-12-29 01:40:34 +01:00
Doxyfile Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
INSTALL
…
LICENSE
…
MAINTAINERS v410 encoder and decoder 2011-12-14 03:38:57 +01:00
Makefile Makefile: fix path to ffprobe.xsd 2011-12-27 22:29:40 +01:00
README
…
RELEASE Prepare for 0.8_beta1 snapshot release 2011-12-23 15:38:15 +01:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
cmdutils.c ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
cmdutils.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
cmdutils_common_opts.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure Merge remote-tracking branch 'qatar/master' 2011-12-28 02:38:33 +01:00
ffmpeg.c ff* tools: move descriptions from copyright header to @file doxy 2011-12-27 12:58:08 +01:00
ffplay.c ff* tools: move descriptions from copyright header to @file doxy 2011-12-27 12:58:08 +01:00
ffprobe.c ffprobe: add XML writer 2011-12-27 12:58:24 +01:00
ffserver.c ff* tools: move descriptions from copyright header to @file doxy 2011-12-27 12:58:08 +01:00
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
version.sh
…

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.