diff options
| author | pacman <pacman@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-31 22:19:48 +0000 |
|---|---|---|
| committer | pacman <pacman@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-31 22:19:48 +0000 |
| commit | 0265bf2065400411ff52f89a1a0faee16ba0c18b (patch) | |
| tree | 8c14341926d807a218bebd0f5c7f6c49a34f4ac9 /libmpcodecs | |
| parent | 8f8547ae863e740f76fbe88064c28c1c4da1182b (diff) | |
| download | mpv-0265bf2065400411ff52f89a1a0faee16ba0c18b.tar.bz2 mpv-0265bf2065400411ff52f89a1a0faee16ba0c18b.tar.xz | |
Fix bogus pointer addition in the extraction of extradata from
BITMAPINFOHEADER.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19283 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index ddb3fc3f11..5e05a27ba3 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -274,8 +274,7 @@ static int init(sh_video_t *sh){ 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 { |