1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 1c27359867 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dsicinvideo: validate buffer offset before copying pixels.
  cook: error out on quant_index values outside [-63, 63] range.
  mpc: pad mpc_CC/SCF[] tables to allow for negative indices.

Conflicts:
	libavcodec/cook.c
	libavcodec/dsicinav.c
	libavcodec/mpc.c
	libavcodec/mpc7.c
	libavcodec/mpcdata.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-12 04:35:06 +01:00
doc doc: add vf_crop keepaspect documentation 2012-03-11 17:47:06 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-03-12 04:35:06 +01:00
libavdevice alsa: fix timefilter usage. 2012-03-05 16:57:28 +01:00
libavfilter vf_crop: keepaspect support 2012-03-11 17:46:31 +01:00
libavformat Fix frame height vs field height confusion in MXF decoding. 2012-03-11 17:39:52 +01:00
libavutil libavutil: document av_force_cpu_flags(-1). 2012-03-08 00:39:56 +01:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample swr: special case for empty channels in rematrix. 2012-03-07 23:56:00 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-03-08 02:51:45 +01:00
mt-work
presets
tests FATE: add test for cdxl demuxer 2012-03-11 17:25:29 +01:00
tools Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
.gitignore Remove libpostproc. 2012-02-23 19:36:16 +01:00
Changelog lavfi: port MP swapuv filter 2012-03-10 00:10:37 +01: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-07 03:22:49 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
common.mak
configure Add missing requirements to libavdevice.pc if lavfi is enabled. 2012-03-11 00:48:36 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c lavf: Add system to seperate relative timestamps from absolute ones. 2012-03-09 19:36:12 +01:00
ffplay.c ffplay: fix two const warnings. 2012-03-08 17:13:58 +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
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
LICENSE Remove libpostproc. 2012-02-23 19:36:16 +01:00
MAINTAINERS libutvideo: Add Ut Video encoder wrapper 2012-03-05 22:25:49 +01:00
Makefile Remove libpostproc. 2012-02-23 19:36:16 +01:00
README
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.