• 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
tiff.c 22.6 KB