diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2007-05-12 00:31:48 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2007-05-12 00:31:48 +0000 |
| commit | 5b67307a6898d9b1b1b78034d4f4fa79932d91bf (patch) | |
| tree | fb2f2625a747802a2fe4a6c1c3f050748eab4af7 /libavcodec/utils.c | |
| parent | 5f097703829b5dbb0acaf48568102c4997e128bc (diff) | |
| download | ffmpeg-5b67307a6898d9b1b1b78034d4f4fa79932d91bf.tar.gz | |
fix a crash with svq1 + sse2.
EMU_EDGE broke memory alignment when the desired alignment is >32 bytes.
Originally committed as revision 8999 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b17c4563cd..ef429beefe 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -267,6 +267,8 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){ w+= EDGE_WIDTH*2; h+= EDGE_WIDTH*2; } + avcodec_align_dimensions(s, &w, &h); + avpicture_fill(&picture, NULL, s->pix_fmt, w, h); pixel_size= picture.linesize[0]*8 / w; //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d\n", (int)picture.data[1], w, h, s->pix_fmt); |