diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-28 14:04:43 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-28 14:24:27 +0100 |
commit | c73fcc8de3e314304819eed89216727a20e5e8a0 (patch) | |
tree | badd72ed694f9712c3cfdc92bac9f88f97e6b106 /libavcodec/vp8.c | |
parent | 8943ad40146d322f5a5bf2bab790d117ec7a4c37 (diff) | |
parent | 424b1e764263b1493de4c34365ef367ddae856db (diff) | |
download | ffmpeg-streaming-c73fcc8de3e314304819eed89216727a20e5e8a0.zip ffmpeg-streaming-c73fcc8de3e314304819eed89216727a20e5e8a0.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
yuv4mpeg: reject unsupported codecs
nutenc: K&R formatting cosmetics
assdec: fix qsort() callback signature
configure: detect sparc64 automatically
vp8: fix memset() crossing array boundary
h264: fix invalid pointer arithmetic
amrwbdec: fix invalid pointer arithmetic
Conflicts:
libavformat/nutenc.c
libavformat/yuv4mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp8.c')
-rw-r--r-- | libavcodec/vp8.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 0bb5495..9424c45 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -1965,7 +1965,8 @@ static int vp8_decode_frame(AVCodecContext *avctx, void *data, int *data_size, // top edge of 127 for intra prediction if (!(avctx->flags & CODEC_FLAG_EMU_EDGE)) { s->top_border[0][15] = s->top_border[0][23] = 127; - memset(s->top_border[1]-1, 127, s->mb_width*sizeof(*s->top_border)+1); + s->top_border[0][31] = 127; + memset(s->top_border[1], 127, s->mb_width*sizeof(*s->top_border)); } memset(s->ref_count, 0, sizeof(s->ref_count)); |