# HG changeset patch # User pacman # Date 1154384388 0 # Node ID 3f910f7b0e533b1a7a146b37ef2f5302cdfca404 # Parent 6fae24d401384af6d1fba2bf5abe706653c825eb Fix bogus pointer addition in the extraction of extradata from BITMAPINFOHEADER. diff -r 6fae24d40138 -r 3f910f7b0e53 libmpcodecs/vd_ffmpeg.c --- a/libmpcodecs/vd_ffmpeg.c Mon Jul 31 20:32:38 2006 +0000 +++ b/libmpcodecs/vd_ffmpeg.c Mon Jul 31 22:19:48 2006 +0000 @@ -274,8 +274,7 @@ avctx->flags |= CODEC_FLAG_EXTERN_HUFF; avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER); avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); - memcpy(avctx->extradata, sh->bih+sizeof(BITMAPINFOHEADER), - avctx->extradata_size); + memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size); #if 0 {