No description
Find a file
Michael Niedermayer 0edf7ebcd6 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: clear trailing bits in partially parsed NAL units
  vc1: Handle WVC1 interlaced stream
  xl: Fix overreads
  mpegts: rename payload_index to payload_size
  segment: introduce segmented chain muxer
  lavu: add AVERROR_BUG error value
  avplay: clear pkt_temp when pkt is freed.
  qcelpdec: K&R formatting cosmetics
  qcelpdec: cosmetics: drop some pointless parentheses
  x86: conditionally compile dnxhd encoder optimizations
  Revert "h264: skip start code search if the size of the nal unit is known"
  swscale: fix formatting and indentation of unscaled conversion routines.
  h264: skip start code search if the size of the nal unit is known
  cljr: fix buf_size sanity check
  cljr: Check if width and height are positive integers

Conflicts:
	libavcodec/cljr.c
	libavcodec/vc1dec.c
	libavformat/Makefile
	libavformat/mpegtsenc.c
	libavformat/segment.c
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-20 04:12:09 +01:00
doc Merge remote-tracking branch 'qatar/master' 2011-12-20 04:12:09 +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-20 04:12:09 +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 Merge remote-tracking branch 'qatar/master' 2011-12-20 04:12:09 +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 Merge remote-tracking branch 'qatar/master' 2011-12-13 23:21:37 +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 '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-20 04:12:09 +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
cmdutils_common_opts.h fftools: add -report option. 2011-12-10 16:40:03 +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 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 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00: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 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 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 cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02: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.