• 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
..
amv Loading commit data...
asv1 Loading commit data...
asv2 Loading commit data...
cljr Loading commit data...
dnxhd_1080i Loading commit data...
dnxhd_720p Loading commit data...
dnxhd_720p_10bit Loading commit data...
dnxhd_720p_rd Loading commit data...
dv Loading commit data...
dv50 Loading commit data...
dv_411 Loading commit data...
error Loading commit data...
ffv1 Loading commit data...
flashsv Loading commit data...
flashsv2 Loading commit data...
flv Loading commit data...
h261 Loading commit data...
h263 Loading commit data...
h263p Loading commit data...
huffyuv Loading commit data...
jpeg2000 Loading commit data...
jpegls Loading commit data...
ljpeg Loading commit data...
mjpeg Loading commit data...
mpeg Loading commit data...
mpeg1b Loading commit data...
mpeg2 Loading commit data...
mpeg2_422 Loading commit data...
mpeg2_idct_int Loading commit data...
mpeg2_ilace Loading commit data...
mpeg2_ivlc_qprd Loading commit data...
mpeg2thread Loading commit data...
mpeg2thread_ilace Loading commit data...
mpeg4 Loading commit data...
mpeg4_adap Loading commit data...
mpeg4_qpel Loading commit data...
mpeg4_qprd Loading commit data...
mpeg4adv Loading commit data...
mpeg4nr Loading commit data...
mpeg4thread Loading commit data...
mpng Loading commit data...
msmpeg4 Loading commit data...
msmpeg4v2 Loading commit data...
msvideo1 Loading commit data...
prores Loading commit data...
prores_kostya Loading commit data...
qtrle Loading commit data...
qtrlegray Loading commit data...
r210 Loading commit data...
rc Loading commit data...
rgb Loading commit data...
roq Loading commit data...
rv10 Loading commit data...
rv20 Loading commit data...
snow Loading commit data...
snowll Loading commit data...
svq1 Loading commit data...
v210 Loading commit data...
v308 Loading commit data...
vref Loading commit data...
wmv1 Loading commit data...
wmv2 Loading commit data...
y41p Loading commit data...
yuv Loading commit data...
yuv4 Loading commit data...
zlib Loading commit data...
zmbv Loading commit data...