Go to file
Michael Niedermayer 28d3738428 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Add LATM demuxer
  avplay: flush audio decoder with empty packets at EOF if the decoder has CODEC_CAP_DELAY set.
  8svx/iff: fix decoding of compressed stereo 8svx files.
  8svx: log an error message if output buffer is too small
  8svx: check packet size before reading the initial sample value.
  8svx: output 8-bit samples instead of 16-bit.
  8svx: split delta decoding into a separate function.
  mp4: Don't read an empty Decoder Config Descriptor
  fate.sh: Ignore errors from rm command during cleanup.
  fate.sh: Run git-pull in quiet mode to avoid console spam.
  Apple ProRes decoder
  rtmp: Make the input FLV parser handle data cut at any point
  rv34: Check for invalid slices offsets
  eval: test isnan(sqrt(-1)) instead of just sqrt(-1)

Conflicts:
	Changelog
	libavcodec/8svx.c
	libavcodec/proresdec.c
	libavcodec/version.h
	libavformat/iff.c
	libavformat/version.h
	tests/ref/fate/eval

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-23 00:35:31 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
ffpresets presets: use private options in libx264-ipod ffpresets 2011-09-22 06:27:07 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
libavfilter vf_drawtext: remove useless and misnamed intermediary "baseline" variable in draw_text() 2011-09-22 00:45:59 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
libpostproc libpostproc: mmx code uses stack below %esp, fix that 2011-09-20 21:37:00 +02:00
libswresample rematrix: dont use floats for int16 code. 2011-09-19 09:25:50 +02:00
libswscale Hack around gcc 4.6 breaking asm using call. 2011-09-20 19:05:51 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
tools graph2dot: show timebase information for audio links 2011-09-17 01:36:32 +02:00
.gitignore gitignore: add libswresample* 2011-09-19 17:39:38 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
cmdutils.c Fix compilation without --disable-swscale. 2011-09-18 19:06:49 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
common.mak Add libswresample. 2011-09-19 07:04:17 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +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 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 doxygen: dont generate docs for avconv.c 2011-09-08 17:56:17 +02:00
ffmpeg.c Revert "ffmpeg: get rid of useless AVInputStream.nb_streams." 2011-09-21 14:12:00 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
ffprobe.c ffprobe: remove misplaced and pointless comment. 2011-09-22 00:22:53 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
MAINTAINERS MAINTAINERS: add my GPG fingerprint. 2011-09-19 17:04:34 +02:00
Makefile Add libswresample. 2011-09-19 07:04:17 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
RELEASE set Release to 0.8.2.git. We are at 0.8.2 and a bit further. 2011-08-13 03:39:58 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-07-31 00:34:47 +02: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.