Go to file
Michael Niedermayer ec1ffae0cd Merge remote-tracking branch 'qatar/master'
* qatar/master:
  qcelpdec: cosmetics: do not add line break before opening bracket in 'for', 'while', 'if/else', and 'switch' statements.
  qcelp: check output buffer size before decoding
  qcelpdec: fix the return value of qcelp_decode_frame().
  sipr: fix the output data size check and only calculate it once.
  Synchronize various 4CCs and codec tags from FFmpeg.
  qdm2: check output buffer size before decoding
  Fix out of bound reads in the QDM2 decoder.
  Check for out of bound writes in the QDM2 decoder.
  ogg/celt: do not set sample_fmt in the demuxer

Conflicts:
	libavcodec/avcodec.h
	libavcodec/qdm2.c
	libavformat/oggparsecelt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-05 04:07:59 +02:00
doc vf_lut.c: fix wrong syntax in example 2011-10-02 15:21:12 +02:00
ffpresets remove libx264 lossless presets 2011-09-26 22:04:23 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-10-05 04:07:59 +02:00
libavdevice libcdio: Fix missing avclass in context 2011-10-03 15:40:40 +02:00
libavfilter deshake: simplify filename check. 2011-10-04 21:36:54 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-10-05 04:07:59 +02:00
libavutil avutil: bump for av_get_default_channel_layout() 2011-10-03 01:17:42 +02:00
libpostproc postproc: fix compilation failure, now really 2011-09-24 01:51:35 +02:00
libswresample swresample: check for invalid sample formats. 2011-10-01 01:39:17 +02:00
libswscale Enable conversions to YUV444P9/YUV444P10, they seem to work fine. 2011-10-03 21:31:46 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests fate: fix due to new yuv444 formats 2011-10-03 23:43:22 +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-29 01:11:01 +02:00
Changelog Add libmodplug support. 2011-10-04 22:36:33 +02:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
cmdutils.c Show configuration and library version with AV_LOG_INFO. 2011-09-29 12:59:05 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
common.mak Add libswresample. 2011-09-19 07:04:17 +02:00
configure configure: fix compilation without libmodplug 2011-10-05 00:34:14 +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 Merge remote-tracking branch 'qatar/master' 2011-09-29 01:11:01 +02:00
ffplay.c ffplay: use libswresample instead of av_audio_convert 2011-10-02 22:23:11 +02:00
ffprobe.c ffprobe: fix trailing '=' in stream id. 2011-09-28 17:57:22 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-10-01 02:54:46 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS Add libmodplug support. 2011-10-04 22:36:33 +02:00
Makefile Add libswresample. 2011-09-19 07:04:17 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE RELEASE: 0.8.5 has been released 2011-10-03 23:32:22 +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.