• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 79ae084e
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    79ae084e
Name
Last commit
Last update
..
aac.mak Loading commit data...
ac3.mak Loading commit data...
adpcm.mak Loading commit data...
als.mak Loading commit data...
amrnb.mak Loading commit data...
amrwb.mak Loading commit data...
atrac.mak Loading commit data...
audio.mak Loading commit data...
cdxl.mak Loading commit data...
dct.mak Loading commit data...
demux.mak Loading commit data...
dfa.mak Loading commit data...
dpcm.mak Loading commit data...
ea.mak Loading commit data...
fft.mak Loading commit data...
h264.mak Loading commit data...
image.mak Loading commit data...
indeo.mak Loading commit data...
libavcodec.mak Loading commit data...
libavutil.mak Loading commit data...
lossless-audio.mak Loading commit data...
lossless-video.mak Loading commit data...
mapchan.mak Loading commit data...
microsoft.mak Loading commit data...
mp3.mak Loading commit data...
mpc.mak Loading commit data...
pcm.mak Loading commit data...
prores.mak Loading commit data...
qt.mak Loading commit data...
qtrle.mak Loading commit data...
real.mak Loading commit data...
screen.mak Loading commit data...
utvideo.mak Loading commit data...
video.mak Loading commit data...
voice.mak Loading commit data...
vorbis.mak Loading commit data...
vpx.mak Loading commit data...
vqf.mak Loading commit data...
wavpack.mak Loading commit data...
wma.mak Loading commit data...