diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 647f83e..c2fdeee 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -375,11 +375,13 @@ int ff_hevc_decode_nal_vps(HEVCContext *s)
                    vps->vps_max_dec_pic_buffering[i] - 1);
             goto err;
         }
+#if 0
         if (vps->vps_num_reorder_pics[i] > vps->vps_max_dec_pic_buffering[i] - 1) {
             av_log(s->avctx, AV_LOG_ERROR, "vps_max_num_reorder_pics out of range: %d\n",
                    vps->vps_num_reorder_pics[i]);
             goto err;
         }
+#endif
     }

     vps->vps_max_layer_id   = get_bits(gb, 6);
diff --git a/libavcodec/x86/hevc_mc.asm b/libavcodec/x86/hevc_mc.asm
index 5cf37d0..c11e253 100644
--- a/libavcodec/x86/hevc_mc.asm
+++ b/libavcodec/x86/hevc_mc.asm
@@ -30,8 +30,8 @@ zero:                   times 4  dd 0
 one_per_32:             times 4  dd 1

 SECTION .text
-%macro EPEL_TABLE 4
-hevc_epel_filters_%4_%1 times %2 d%3 -2, 58
+%macro EPEL_TABLE 3
+hevc_epel_filters_%1 times %2 d%3 -2, 58
                         times %2 d%3 10, -2
                         times %2 d%3 -4, 54
                         times %2 d%3 16, -2
@@ -49,11 +49,11 @@ hevc_epel_filters_%4_%1 times %2 d%3 -2, 58



-EPEL_TABLE  8, 8, b, sse4
-EPEL_TABLE 10, 4, w, sse4
+EPEL_TABLE  8, 8, b
+EPEL_TABLE 10, 4, w

-%macro QPEL_TABLE 4
-hevc_qpel_filters_%4_%1 times %2 d%3  -1,  4
+%macro QPEL_TABLE 3
+hevc_qpel_filters_%1 times %2 d%3  -1,  4
                         times %2 d%3 -10, 58
                         times %2 d%3  17, -5
                         times %2 d%3   1,  0
@@ -67,10 +67,10 @@ hevc_qpel_filters_%4_%1 times %2 d%3  -1,  4
                         times %2 d%3   4, -1
 %endmacro

-QPEL_TABLE  8, 8, b, sse4
-QPEL_TABLE 10, 4, w, sse4
+QPEL_TABLE  8, 8, b
+QPEL_TABLE 10, 4, w

-%define hevc_qpel_filters_sse4_14 hevc_qpel_filters_sse4_10
+%define hevc_qpel_filters_14 hevc_qpel_filters_10

 %if ARCH_X86_64

@@ -114,9 +114,9 @@ QPEL_TABLE 10, 4, w, sse4

 %macro EPEL_FILTER 2-4                            ; bit depth, filter index
 %ifdef PIC
-    lea         rfilterq, [hevc_epel_filters_sse4_%1]
+    lea         rfilterq, [hevc_epel_filters_%1]
 %else
-    %define rfilterq hevc_epel_filters_sse4_%1
+    %define rfilterq hevc_epel_filters_%1
 %endif
     sub              %2q, 1
     shl              %2q, 5                      ; multiply by 32
@@ -131,9 +131,9 @@ QPEL_TABLE 10, 4, w, sse4

 %macro EPEL_HV_FILTER 1
 %ifdef PIC
-    lea         rfilterq, [hevc_epel_filters_sse4_%1]
+    lea         rfilterq, [hevc_epel_filters_%1]
 %else
-    %define rfilterq hevc_epel_filters_sse4_%1
+    %define rfilterq hevc_epel_filters_%1
 %endif
     sub              mxq, 1
     sub              myq, 1
@@ -144,9 +144,9 @@ QPEL_TABLE 10, 4, w, sse4
     lea           r3srcq, [srcstrideq*3]

 %ifdef PIC
-    lea         rfilterq, [hevc_epel_filters_sse4_10]
+    lea         rfilterq, [hevc_epel_filters_10]
 %else
-    %define rfilterq hevc_epel_filters_sse4_10
+    %define rfilterq hevc_epel_filters_10
 %endif
     movdqa           m12, [rfilterq + myq]        ; get 2 first values of filters
     movdqa           m13, [rfilterq + myq+16]     ; get 2 last values of filters
@@ -154,9 +154,9 @@ QPEL_TABLE 10, 4, w, sse4

 %macro QPEL_FILTER 2
 %ifdef PIC
-    lea         rfilterq, [hevc_qpel_filters_sse4_%1]
+    lea         rfilterq, [hevc_qpel_filters_%1]
 %else
-    %define rfilterq hevc_qpel_filters_sse4_%1
+    %define rfilterq hevc_qpel_filters_%1
 %endif
     lea              %2q, [%2q*8-8]
     movdqa           m12, [rfilterq + %2q*8]       ; get 4 first values of filters
@@ -389,9 +389,9 @@ QPEL_TABLE 10, 4, w, sse4

 %macro QPEL_HV_COMPUTE 4     ; width, bitdepth, filter idx
 %ifdef PIC
-    lea         rfilterq, [hevc_qpel_filters_sse4_%2]
+    lea         rfilterq, [hevc_qpel_filters_%2]
 %else
-    %define rfilterq hevc_qpel_filters_sse4_%2
+    %define rfilterq hevc_qpel_filters_%2
 %endif

 %if %2 == 8
@@ -498,7 +498,6 @@ QPEL_TABLE 10, 4, w, sse4
 %endif
 %endmacro

-INIT_XMM sse4                                    ; adds ff_ and _sse4 to function name
 ; ******************************
 ; void put_hevc_mc_pixels(int16_t *dst, ptrdiff_t dststride,
 ;                         uint8_t *_src, ptrdiff_t _srcstride,
@@ -1219,6 +1218,8 @@ cglobal hevc_put_hevc_bi_w%1_%2, 6, 7, 10, dst, dststride, src, srcstride, src2,
     RET
 %endmacro

+INIT_XMM sse4
+
 WEIGHTING_FUNCS 2, 8
 WEIGHTING_FUNCS 4, 8
 WEIGHTING_FUNCS 6, 8