Go to file
Michael Niedermayer 797ef671dd Merge remote-tracking branch 'newdev/master'
* newdev/master:
  matroskadec: set default duration for simple block
  When building for MinGW32 disable strict ANSI compliancy.
  ARM: fix ff_apply_window_int16_neon() prototype
  configure: check for --as-needed support early
  ARM: NEON optimised apply_window_int16()
  ac3enc: NEON optimised shift functions
  ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min
  mpeg12.c: fix slice threading for mpeg2 field picture mode.
  ffmetadec.c: fix compiler warnings.
  configure: Don't explicitly disable ffplay or in/outdevices on dos
  configure: Remove the explicit disabling of ffserver
  configure: Add fork as a dependency to ffserver

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-25 02:57:41 +01:00
doc Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
ffpresets Update qmin/qmax values for libx264 presets 2011-02-09 03:33:56 +01:00
libavcodec Merge remote-tracking branch 'newdev/master' 2011-03-25 02:57:41 +01:00
libavdevice Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
libavfilter Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
libavformat Merge remote-tracking branch 'newdev/master' 2011-03-25 02:57:41 +01:00
libavutil Fix apparently exploitable race condition. 2011-03-25 02:24:32 +01:00
libpostproc Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
libswscale Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-25 02:51:20 +01:00
tests Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
tools Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
.gitignore consolidate .gitignore patters into a single file 2011-01-18 21:32:05 +01:00
Changelog Merge remote-tracking branch 'newdev/master' 2011-03-17 17:22:52 +01:00
cmdutils_common_opts.h
cmdutils.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
cmdutils.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
common.mak Merge libavcore into libavutil 2011-02-16 23:00:30 +01:00
configure Merge remote-tracking branch 'newdev/master' 2011-03-25 02:57:41 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
ffmpeg.c Make multiple Ctrl-C capable to kill stuck protocols. 2011-03-25 02:26:49 +01:00
ffplay.c ffplay: Don't assume ic->pb is non-null 2011-03-21 15:08:09 -04:00
ffprobe.c ffprobe: tweak error message in open_input_file() 2011-03-21 16:45:21 +01:00
ffserver.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ffserver.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
INSTALL Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
LICENSE Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
MAINTAINERS Delete MAINTAINERS file 2011-03-14 21:13:27 +00:00
Makefile Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
subdir.mak fix building test programs with gnu make 3.82 2010-12-07 16:42:25 +00:00
version.sh Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.