-
- Downloads
Merge remote-tracking branch 'qatar/master'
* 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:
Michael Niedermayer <michaelni@gmx.at>
Showing
- doc/Makefile 1 addition, 1 deletiondoc/Makefile
- ffplay.c 1 addition, 2 deletionsffplay.c
- ffserver.c 3 additions, 6 deletionsffserver.c
- libavcodec/4xm.c 2 additions, 4 deletionslibavcodec/4xm.c
- libavcodec/aaccoder.c 1 addition, 2 deletionslibavcodec/aaccoder.c
- libavcodec/aacpsy.c 2 additions, 4 deletionslibavcodec/aacpsy.c
- libavcodec/ac3dec.c 1 addition, 3 deletionslibavcodec/ac3dec.c
- libavcodec/alsdec.c 3 additions, 8 deletionslibavcodec/alsdec.c
- libavcodec/bink.c 1 addition, 2 deletionslibavcodec/bink.c
- libavcodec/cabac_functions.h 2 additions, 2 deletionslibavcodec/cabac_functions.h
- libavcodec/cook.c 6 additions, 14 deletionslibavcodec/cook.c
- libavcodec/dct-test.c 1 addition, 7 deletionslibavcodec/dct-test.c
- libavcodec/dv.c 4 additions, 2 deletionslibavcodec/dv.c
- libavcodec/dvdata.c 12 additions, 0 deletionslibavcodec/dvdata.c
- libavcodec/dvdata.h 5 additions, 0 deletionslibavcodec/dvdata.h
- libavcodec/dvdec.c 0 additions, 1 deletionlibavcodec/dvdec.c
- libavcodec/dvdsubdec.c 2 additions, 4 deletionslibavcodec/dvdsubdec.c
- libavcodec/dxva2.c 1 addition, 2 deletionslibavcodec/dxva2.c
- libavcodec/faandct.c 16 additions, 21 deletionslibavcodec/faandct.c
- libavcodec/faandct.h 0 additions, 2 deletionslibavcodec/faandct.h
Loading
Please register or sign in to comment