1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer c8a441efe2 Merge remote-tracking branch 'cus/stable'
* cus/stable:
  ffplay: remove global video state

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-20 00:15:06 +01:00
doc Merge remote-tracking branch 'qatar/master' 2011-12-19 02:34:18 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec eamad: pass & check errors 2011-12-19 16:30:30 +01:00
libavdevice lavd/lavfi: fix incomplete comment 2011-12-18 01:04:02 +01:00
libavfilter Merge remote-tracking branch 'qatar/master' 2011-12-13 23:21:37 +01:00
libavformat siff: simplify code by using ffio_limit() 2011-12-19 21:11:09 +01:00
libavutil avutil: check sampleformats enum, pict type enum and media type enum against insert/remove mistakes. 2011-12-17 05:47:37 +01:00
libpostproc Merge remote-tracking branch 'qatar/master' 2011-12-13 23:21:37 +01:00
libswresample Merge remote-tracking branch 'qatar/master' 2011-12-13 23:21:37 +01:00
libswscale sws: Print an error in case of av_malloc() failure 2011-12-19 16:02:52 +01:00
mt-work
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests Merge remote-tracking branch 'tjoppen/proper_mxf_track_linking' 2011-12-18 23:11:05 +01:00
tools Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
.gitignore gitignore: add libswresample* 2011-09-19 17:39:38 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-12-17 02:18:16 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-12-19 02:34:18 +01:00
cmdutils_common_opts.h fftools: add -report option. 2011-12-10 16:40:03 +01:00
cmdutils.c fftools: add -report option. 2011-12-10 16:40:03 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure Assume architecture arm for machine hardware name iPad*. 2011-12-18 13:48:44 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile Correct use of OSX to Mac OS X and properly format yasm providers on Mac OS X 2011-12-11 03:00:30 +01:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-12-17 02:18:16 +01:00
ffplay.c ffplay: remove global video state 2011-12-19 21:38:41 +01:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
INSTALL
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 v410 encoder and decoder 2011-12-14 03:38:57 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-12-14 23:58:10 +01:00
README
RELEASE RELEASE: We're now at 0.9.0.git 2011-12-16 15:20:13 +01:00
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.