1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 2f7bd3b516 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  apedec: check bits <= 32.
  cavs: Remove unused code.
  oggenc: fix condition when not to flush due to keyframe granule.
  oggenc: add pagesize option to set preferred page size
  libspeexdec: set frame size in libspeex_decode_init()
  smacker audio: sign-extend the initial 16-bit predicted value

Conflicts:
	libavcodec/apedec.c
	libavcodec/libspeexdec.c
	libavformat/oggenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-01 00:36:43 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-03-30 22:10:17 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-04-01 00:36:43 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
libavfilter lavfi/fade: fix black level for non studio-level pixel formats 2012-03-31 15:55:43 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-04-01 00:36:43 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample swr-test: test the new flexible buffering 2012-03-25 21:50:49 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
mt-work
presets
tests FATE: Add RALF decoding test 2012-03-31 22:33:00 +02:00
tools Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-03-25 23:10:30 +02:00
Changelog XBM decoder 2012-03-27 20:08:41 +02: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-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-30 22:10:17 +02: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 ffmpeg: check pts like dts for being in the past. 2012-03-29 22:32:53 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
LICENSE Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
MAINTAINERS ZeroCodec Decoder 2012-03-19 00:19:13 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
README
RELEASE RELEASE: bump to current version (0.10.2). 2012-03-26 22:47:28 +02:00
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.