Go to file
Michael Niedermayer 7e496e1545 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: ppc: drop stray leftover backslash
  build: Only clean the architecture subdirectory we build for.
  build: drop some unnecessary dependencies from the H.264 parser
  build: prettyprinting cosmetics
  libavutil: Remove pointless rational test program.
  libavutil: Remove broken and pointless lzo test program.
  lavf doxy: expand AVStream.codec doxy.
  lavf doxy: improve AVStream.time_base doxy.
  lavf doxy: add some basic documentation about reading from the demuxer.
  lavf doxy: document passing options to demuxers.
  lavf doxy: clarify that an AVPacket contains encoded data.
  mpegtsenc: allow user triggered PES packet flushing
  APIchanges: mark the place where 0.7 was cut.
  APIchanges: mark the place where 0.8 was cut.
  APIchanges: fill in missing dates and hashes.
  smacker: convert palette and header reading to bytestream2.
  alac: convert extradata reading to bytestream2.

Conflicts:
	doc/APIchanges
	libavcodec/smacker.c
	libavcodec/x86/Makefile
	libavfilter/Makefile
	libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-26 20:52:52 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
libavdevice x11grab: fix compilation 2012-03-18 01:12:03 +01:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample swr-test: test the new flexible buffering 2012-03-25 21:50:49 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02: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 vf_hflip: accept PIX_FMT_RGB444 and PIX_FMT_BGR444 pixel formats 2012-03-26 01:02:18 +02:00
tools Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-03-25 23:10:30 +02:00
Changelog "Metal Gear Solid: The Twin Snakes" demuxer 2012-03-25 12:22:06 +02:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c Fix SVCD scan_offset option 2012-03-25 19:29:31 +02:00
ffplay.c ffplay: use frame count based queueing for audio queue 2012-03-19 22:54:40 +01:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
ffserver.c ffserver: add missing buffer set after rewrite av_open_input_file to avformat_open_input. 2012-03-12 03:31:59 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
LICENSE Remove libpostproc. 2012-02-23 19:36:16 +01:00
MAINTAINERS ZeroCodec Decoder 2012-03-19 00:19:13 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +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.