1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 3be1a4ba9a Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavc: always align height by 32 pixel
  raw: add 10bit YUV definitions
  nut: support 10bit YUV
  mpegvideo_enc: separate declarations and statements
  oma: make header compile standalone
  vp3: Reorder some functions to fix VP3 build with Theora disabled.
  build: fix standalone compilation of ADX encoder
  build: fix standalone compilation of ADPCM decoders
  build: fix standalone compilation of mpc7/mpc8 decoders
  4xm: Use bytestream2 functions to prevent overreads
  bytestream: add a new set of bytestream functions with overread checking
  mpegts: Suppress invalid timebase warnings on DMB streams.
  mpegts: Fix typo in handling sections in the PMT.
  vc1dec: Use the right pointer type for the tmp pointer

Conflicts:
	libavcodec/4xm.c
	libavcodec/utils.c
	libavcodec/vc1dec.c
	libavcodec/vp3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-21 03:40:53 +01:00
doc doc: make developer.texi point to correct fate doc 2011-12-20 18:12:36 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-12-21 03:40:53 +01:00
libavdevice lavd/lavfi: reindent block in lavfi_read_header 2011-12-20 13:19:36 +01:00
libavfilter Merge remote-tracking branch 'qatar/master' 2011-12-13 23:21:37 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-12-21 03:40:53 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-12-20 04:12:09 +01:00
libpostproc Merge remote-tracking branch 'qatar/master' 2011-12-13 23:21:37 +01:00
libswresample swr: fix assert failure 2011-12-20 11:28:34 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-12-20 04:12:09 +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' 2011-12-21 03:40:53 +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
avconv.c ff*: Fix duplicatedly printed version info with -version 2011-12-20 22:23:12 +01:00
Changelog Changelog: split version next and 0.9 2011-12-20 11:28:34 +01:00
cmdutils_common_opts.h fftools: add -report option. 2011-12-10 16:40:03 +01:00
cmdutils.c ff*: Fix duplicatedly printed version info with -version 2011-12-20 22:23:12 +01:00
cmdutils.h ff*: Fix duplicatedly printed version info with -version 2011-12-20 22:23:12 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure Merge remote-tracking branch 'qatar/master' 2011-12-21 03:40:53 +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 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 ff*: Fix duplicatedly printed version info with -version 2011-12-20 22:23:12 +01:00
ffplay.c ff*: Fix duplicatedly printed version info with -version 2011-12-20 22:23:12 +01:00
ffprobe.c ff*: Fix duplicatedly printed version info with -version 2011-12-20 22:23:12 +01:00
ffserver.c ff*: Fix duplicatedly printed version info with -version 2011-12-20 22:23:12 +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 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 Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE RELEASE: We're now at 0.9.0.git 2011-12-16 15:20:13 +01:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.