1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer bd4ebbbbed Merge remote-tracking branch 'qatar/master'
* qatar/master:
  proresdsp: fix function prototypes.
  prores-idct: fix overflow in c code.
  fate: update prores-alpha ref after changing pix_fmt to yuv444p10le
  prores: add missing feature warning for alpha
  mov: 10l: Terminate string with 0 not '0'
  mov: Prevent illegal writes when chapter titles are very short.
  prores: add appropriate -fix_fmt parameter to FATE command
  riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header
  lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field
  lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER

Conflicts:
	libavcodec/avcodec.h
	libavformat/mov.c
	tests/fate/prores.mak
	tests/ref/acodec/g726
	tests/ref/fate/prores-alpha

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-14 22:24:00 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-10-14 03:48:22 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2011-10-14 22:24:00 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
libavfilter vsrc_nullsrc: remove mathematical constants now redundant. 2011-10-13 18:08:51 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-10-14 22:24:00 +02:00
libavutil opt: handle AV_OPT_TYPE_CONST too 2011-10-14 02:18:55 +02:00
libpostproc
libswresample
libswscale Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
mt-work
tests Merge remote-tracking branch 'qatar/master' 2011-10-14 22:24:00 +02:00
tools Merge remote-tracking branch 'hexene/stagefright' 2011-10-13 18:04:02 +02:00
.gitignore
avconv.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-10-11 03:42:43 +02:00
cmdutils_common_opts.h cmdutils: Fix loglevel for -debug 2011-10-14 02:18:55 +02:00
cmdutils.c cmdutils: Fix loglevel for -debug 2011-10-14 02:18:55 +02:00
cmdutils.h cmdutils.h: Project name cleanup 2011-10-14 02:18:55 +02:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
subdir.mak
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.