diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c
index 8a02cfe976a5db874c0d7ae00d997914dc1be17b..bc4a0073a114eadadf143dfdd2bef33da39ae4dc 100644
--- a/libavfilter/af_resample.c
+++ b/libavfilter/af_resample.c
@@ -119,7 +119,11 @@ static int config_output(AVFilterLink *outlink)
     av_get_channel_layout_string(buf2, sizeof(buf2),
                                  -1, outlink->channel_layout);
     av_log(ctx, AV_LOG_VERBOSE,
+#if FF_API_SAMPLERATE64
+           "fmt:%s srate:%"PRId64" cl:%s -> fmt:%s srate:%"PRId64" cl:%s\n",
+#else
            "fmt:%s srate:%d cl:%s -> fmt:%s srate:%d cl:%s\n",
+#endif /* FF_API_SAMPLERATE64 */
            av_get_sample_fmt_name(inlink ->format), inlink ->sample_rate, buf1,
            av_get_sample_fmt_name(outlink->format), outlink->sample_rate, buf2);
 
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 09949d7aeb2798c9957923050bcebc1e0ce635e0..6025aad8060c7d17de92d0fe807169bcb23cce4a 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <strings.h>
 #include <float.h>
 
 #include "avformat.h"
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
index 5d8366ca2a1889ab837d0dad93dfe3a1a8cef5c4..d9f0053ba467ae39658fa410078c4f3b33e66390 100644
--- a/tests/fate/vcodec.mak
+++ b/tests/fate/vcodec.mak
@@ -236,6 +236,11 @@ fate-vsynth%-snow:               ENCOPTS = -strict -2 -qscale 2 -flags +qpel \
                                            -me_method iter -dia_size 2       \
                                            -cmp 12 -subcmp 12 -s 128x64
 
+FATE_VCODEC += snow-hpel
+fate-vsynth%-snow-hpel:          ENCOPTS = -strict -2 -qscale 2              \
+                                           -me_method iter -dia_size 2       \
+                                           -cmp 12 -subcmp 12 -s 128x64
+
 FATE_VCODEC += snow-ll
 fate-vsynth%-snow-ll:            ENCOPTS = -strict -2 -qscale .001 -pred 1 \
                                            -flags +mv4+qpel
diff --git a/tests/ref/fate/vsynth1-snow-hpel b/tests/ref/fate/vsynth1-snow-hpel
new file mode 100644
index 0000000000000000000000000000000000000000..e2968b1d91a58466434a9e9b72d114c78d00887f
--- /dev/null
+++ b/tests/ref/fate/vsynth1-snow-hpel
@@ -0,0 +1,4 @@
+301755ff5dcd31c2aefc8f103cfc2917 *tests/data/fate/vsynth1-snow-hpel.avi
+138712 tests/data/fate/vsynth1-snow-hpel.avi
+d6845c8f1310e041afdcebc6bbfc449b *tests/data/fate/vsynth1-snow-hpel.out.rawvideo
+stddev:   22.74 PSNR: 20.99 MAXDIFF:  171 bytes:  7603200/  7603200
diff --git a/tests/ref/fate/vsynth2-snow-hpel b/tests/ref/fate/vsynth2-snow-hpel
new file mode 100644
index 0000000000000000000000000000000000000000..2194a137e3d4d4f42d29d1c0f069b5d5806d3f95
--- /dev/null
+++ b/tests/ref/fate/vsynth2-snow-hpel
@@ -0,0 +1,4 @@
+ac1400b66514aa280300bba6477b4e97 *tests/data/fate/vsynth2-snow-hpel.avi
+61772 tests/data/fate/vsynth2-snow-hpel.avi
+8680d40905f423999d65b996c4dcb984 *tests/data/fate/vsynth2-snow-hpel.out.rawvideo
+stddev:   10.45 PSNR: 27.74 MAXDIFF:  123 bytes:  7603200/  7603200