1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer f58f75dd92 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rv34: error out on size changes with frame threading
  aacsbr: Add a debug check to sbr_mapping.
  aac: Reset some state variables when turning SBR off
  aac: Reset PS parameters on header decode failure.
  fate: add wmalossless test.
  aacsbr: handle m_max values smaller than 4.

Conflicts:
	libavcodec/aacsbr.c
	tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-24 10:59:43 +01:00
doc doc/examples/decoding_encoding: make the buffer bigger. 2012-03-22 05:25:26 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-03-24 10:59:43 +01:00
libavdevice x11grab: fix compilation 2012-03-18 01:12:03 +01:00
libavfilter bbox: remove superfluous initializations 2012-03-22 13:40:37 +01:00
libavformat xmv: check channel number 2012-03-23 10:31:45 +01:00
libavutil pixdesc: put components always in the same order. 2012-03-21 19:01:39 +01:00
libpostproc
libswresample swr: check that there is enough information to do rematrixing when needed. 2012-03-23 12:10:08 +01:00
libswscale swscale: Merge a hunk from qatar that seems to have been forgotten or lost. 2012-03-21 15:30:52 +01:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-03-24 10:59:43 +01:00
tools
.gitignore
Changelog lavfi: add tile video filter. 2012-03-21 15:52:45 +01:00
cmdutils_common_opts.h
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-03-23 21:20:06 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-03-23 21:20:06 +01:00
ffplay.c ffplay: use frame count based queueing for audio queue 2012-03-19 22:54:40 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS ZeroCodec Decoder 2012-03-19 00:19:13 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
README
RELEASE
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.