• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · d40ff29c
    Michael Niedermayer authored
    * qatar/master:
      asf: only set index_read if the index contained entries.
      cabac: add overread protection to BRANCHLESS_GET_CABAC().
      cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC().
      cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE().
      cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC().
      h264: add overread protection to get_cabac_bypass_sign_x86().
      h264: reindent get_cabac_bypass_sign_x86().
      h264: use struct offsets in get_cabac_bypass_sign_x86().
      h264: fix overreads in cabac reader.
      wmall: fix seeking.
      lagarith: fix buffer overreads.
      dvdec: drop unnecessary dv_tablegen.h #include
      build: fix doc generation errors in parallel builds
      Replace memset(0) by zero initializations.
      faandct: Remove FAAN_POSTSCALE define and related code.
      dvenc: print allowed profiles if the video doesn't conform to any of them.
      avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size.
      FATE: add a test for vp8 with changing frame size.
      fate: add kgv1 fate test.
      oggdec: calculate correct timestamps in Ogg/FLAC
    
    Conflicts:
    	libavcodec/4xm.c
    	libavcodec/cook.c
    	libavcodec/dvdata.c
    	libavcodec/dvdsubdec.c
    	libavcodec/lagarith.c
    	libavcodec/lagarithrac.c
    	libavcodec/utils.c
    	tests/fate/video.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d40ff29c
Name
Last commit
Last update
..
Makefile Loading commit data...
ac3dsp.asm Loading commit data...
ac3dsp_mmx.c Loading commit data...
cabac.h Loading commit data...
cavsdsp_mmx.c Loading commit data...
dct32_sse.asm Loading commit data...
deinterlace.asm Loading commit data...
diracdsp_mmx.c Loading commit data...
diracdsp_mmx.h Loading commit data...
diracdsp_yasm.asm Loading commit data...
dnxhd_mmx.c Loading commit data...
dsputil_mmx.c Loading commit data...
dsputil_mmx.h Loading commit data...
dsputil_mmx_avg_template.c Loading commit data...
dsputil_mmx_qns_template.c Loading commit data...
dsputil_mmx_rnd_template.c Loading commit data...
dsputil_yasm.asm Loading commit data...
dsputilenc_mmx.c Loading commit data...
dsputilenc_yasm.asm Loading commit data...
dwt.c Loading commit data...
dwt.h Loading commit data...
dwt_yasm.asm Loading commit data...
fdct_mmx.c Loading commit data...
fft.c Loading commit data...
fft.h Loading commit data...
fft_3dn.c Loading commit data...
fft_3dn2.c Loading commit data...
fft_mmx.asm Loading commit data...
fft_sse.c Loading commit data...
fmtconvert.asm Loading commit data...
fmtconvert_mmx.c Loading commit data...
h264_chromamc.asm Loading commit data...
h264_chromamc_10bit.asm Loading commit data...
h264_deblock.asm Loading commit data...
h264_deblock_10bit.asm Loading commit data...
h264_i386.h Loading commit data...
h264_idct.asm Loading commit data...
h264_idct_10bit.asm Loading commit data...
h264_intrapred.asm Loading commit data...
h264_intrapred_10bit.asm Loading commit data...
h264_intrapred_init.c Loading commit data...
h264_qpel_10bit.asm Loading commit data...
h264_qpel_mmx.c Loading commit data...
h264_weight.asm Loading commit data...
h264_weight_10bit.asm Loading commit data...
h264dsp_mmx.c Loading commit data...
idct_mmx.c Loading commit data...
idct_mmx_xvid.c Loading commit data...
idct_sse2_xvid.c Loading commit data...
idct_xvid.h Loading commit data...
imdct36_sse.asm Loading commit data...
lpc_mmx.c Loading commit data...
mathops.h Loading commit data...
mlpdsp.c Loading commit data...
motion_est_mmx.c Loading commit data...
mpegaudiodec_mmx.c Loading commit data...
mpegvideo_mmx.c Loading commit data...
mpegvideo_mmx_template.c Loading commit data...
pngdsp-init.c Loading commit data...
pngdsp.asm Loading commit data...
proresdsp-init.c Loading commit data...
proresdsp.asm Loading commit data...
rv34dsp.asm Loading commit data...
rv34dsp_init.c Loading commit data...
rv40dsp.asm Loading commit data...
rv40dsp_init.c Loading commit data...
sbrdsp.asm Loading commit data...
sbrdsp_init.c Loading commit data...
simple_idct_mmx.c Loading commit data...
snowdsp_mmx.c Loading commit data...
v210-init.c Loading commit data...
v210.asm Loading commit data...
vc1dsp_mmx.c Loading commit data...
vc1dsp_yasm.asm Loading commit data...
vp3dsp.asm Loading commit data...
vp56_arith.h Loading commit data...
vp56dsp.asm Loading commit data...
vp56dsp_init.c Loading commit data...
vp8dsp-init.c Loading commit data...
vp8dsp.asm Loading commit data...
w64xmmtest.c Loading commit data...