Makefile            |    5 -----
 libavcodec/Makefile |    1 -
 libavcodec/h264.c   |    4 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 70b60a8..3e56867 100644
--- a/Makefile
+++ b/Makefile
@@ -82,11 +82,6 @@ lib:
 	$(MAKE-$(CONFIG_PP))       -C libpostproc all
 	$(MAKE-$(CONFIG_SWSCALER)) -C libswscale  all
 
-ifeq ($(CONFIG_VHOOK),yes)
-all: videohook
-install: install-vhook
-endif
-
 ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
 	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
 
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 984d764..e9452fd 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -368,7 +368,6 @@ OBJS += i386/fdct_mmx.o \
         i386/fft_3dn.o \
         i386/fft_3dn2.o \
 
-i386/dsputil_mmx.o: CFLAGS+= -O3 # "-O2" isn't enough, nor is "-O2 -finline-functions -frename-registers" (so long for gcc documentation)
 OBJS-$(CONFIG_GPL)                     += i386/idct_mmx.o
 
 OBJS-$(CONFIG_CAVS_DECODER)            += i386/cavsdsp_mmx.o
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 0ff2e85..41e4348 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1694,8 +1694,8 @@ static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square,
 
     if(   full_mx < 0-extra_width
        || full_my < 0-extra_height
-       || full_mx + 18/*FIXME*/ > pic_width + extra_width
-       || full_my + 18/*FIXME*/ > pic_height + extra_height){
+       || full_mx + 16/*FIXME*/ > pic_width + extra_width
+       || full_my + 16/*FIXME*/ > pic_height + extra_height){
         ff_emulated_edge_mc(s->edge_emu_buffer, src_y - 2 - 2*h->mb_linesize, h->mb_linesize, 16+5, 16+5/*FIXME*/, full_mx-2, full_my-2, pic_width, pic_height);
             src_y= s->edge_emu_buffer + 2 + 2*h->mb_linesize;
         emu=1;