mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-23 15:53:08 +00:00
d40ff29cac
* 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>
|
||
|---|---|---|
| .. | ||
| aac.mak | ||
| ac3.mak | ||
| adpcm.mak | ||
| als.mak | ||
| amrnb.mak | ||
| amrwb.mak | ||
| atrac.mak | ||
| audio.mak | ||
| cdxl.mak | ||
| dct.mak | ||
| demux.mak | ||
| dfa.mak | ||
| dpcm.mak | ||
| ea.mak | ||
| fft.mak | ||
| h264.mak | ||
| image.mak | ||
| indeo.mak | ||
| libavcodec.mak | ||
| libavutil.mak | ||
| lossless-audio.mak | ||
| lossless-video.mak | ||
| mapchan.mak | ||
| microsoft.mak | ||
| mp3.mak | ||
| mpc.mak | ||
| pcm.mak | ||
| prores.mak | ||
| qt.mak | ||
| qtrle.mak | ||
| real.mak | ||
| screen.mak | ||
| utvideo.mak | ||
| video.mak | ||
| voice.mak | ||
| vorbis.mak | ||
| vpx.mak | ||
| vqf.mak | ||
| wavpack.mak | ||
| wma.mak | ||