1
0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 09:52:17 +00:00
FFmpeg git repo
Go to file
Michael Niedermayer 79ae084e9b Merge remote-tracking branch 'qatar/master'
* qatar/master: (58 commits)
  amrnbdec: check frame size before decoding.
  cscd: use negative error values to indicate decode_init() failures.
  h264: prevent overreads in intra PCM decoding.
  FATE: do not decode audio in the nuv test.
  dxa: set audio stream time base using the sample rate
  psx-str: do not allow seeking by bytes
  asfdec: Do not set AVCodecContext.frame_size
  vqf: set packet parameters after av_new_packet()
  mpegaudiodec: use DSPUtil.butterflies_float().
  FATE: add mp3 test for sample that exhibited false overreads
  fate: add cdxl test for bit line plane arrangement
  vmnc: return error on decode_init() failure.
  libvorbis: add/update error messages
  libvorbis: use AVFifoBuffer for output packet buffer
  libvorbis: remove unneeded e_o_s check
  libvorbis: check return values for functions that can return errors
  libvorbis: use float input instead of s16
  libvorbis: do not flush libvorbis analysis if dsp state was not initialized
  libvorbis: use VBR by default, with default quality of 3
  libvorbis: fix use of minrate/maxrate AVOptions
  ...

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/dpxenc.c
	libavcodec/libvorbis.c
	libavcodec/vmnc.c
	libavformat/asfdec.c
	libavformat/id3v2enc.c
	libavformat/internal.h
	libavformat/mp3enc.c
	libavformat/utils.c
	libavformat/version.h
	libswscale/utils.c
	tests/fate/video.mak
	tests/ref/fate/nuv
	tests/ref/fate/prores-alpha
	tests/ref/lavf/ffm
	tests/ref/vsynth1/prores
	tests/ref/vsynth2/prores

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-01 03:17:11 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-02-29 00:30:35 +01:00
libavfilter vf_deshake: try to fix memleak 2012-02-29 02:33:32 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-02-29 00:30:35 +01:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample Exit ffmpeg if swr_convert() fails. 2012-02-27 19:02:28 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
tools
.gitignore
Changelog Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure libavfilter/libmpcodecs: add vf_pp from current mplayer svn 2012-02-26 20:39:32 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c get_buffers: Check that pix_fmt is not NONE. 2012-02-29 06:27:38 +01:00
ffplay.c get_buffers: Check that pix_fmt is not NONE. 2012-02-29 06:27:38 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.