FFmpeg git repo
Go to file
Michael Niedermayer 4dcd1a3145 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  adtsenc: Check frame size.
  txd: Fix order of operations.
  APIchanges: fill in some blanks
  timer: fix misspelling of "decicycles"
  Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.
  indeo3: cosmetics
  md5proto: Fix order of operations.
  dca: Replace oversized unused get_bits() with skip_bits_long().

Conflicts:
	doc/APIchanges
	libavformat/mmsh.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-29 00:20:29 +01:00
doc Merge remote-tracking branch 'qatar/master' 2011-11-29 00:20:29 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2011-11-29 00:20:29 +01:00
libavdevice
libavfilter avfilter: fix AVFilterPad video only comment. 2011-11-26 19:30:30 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-11-29 00:20:29 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-11-29 00:20:29 +01:00
libpostproc
libswresample
libswscale swscale: alpha less rgb32 support. 2011-11-28 04:14:22 +01:00
mt-work
presets
tests swscale: alpha less rgb32 support. 2011-11-28 04:14:22 +01:00
tools lavfi-showfiltfmts.c: fix handling of null names 2011-11-26 18:12:25 +01:00
.gitignore
avconv.c cmdutils: pass AVCodec to filter_codec_opts() 2011-11-27 21:17:56 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-11-27 00:30:13 +01:00
cmdutils_common_opts.h
cmdutils.c cmdutils: pass AVCodec to filter_codec_opts() 2011-11-27 21:17:56 +01:00
cmdutils.h cmdutils: pass AVCodec to filter_codec_opts() 2011-11-27 21:17:56 +01:00
common.mak
configure lavfi: add libass based subtitles renderer 2011-11-26 10:42:33 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c cmdutils: pass AVCodec to filter_codec_opts() 2011-11-27 21:17:56 +01:00
ffplay.c cmdutils: pass AVCodec to filter_codec_opts() 2011-11-27 21:17:56 +01:00
ffprobe.c ffprobe: print codec timecode if available. 2011-11-28 14:06:02 +01:00
ffserver.c
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
subdir.mak
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.