diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
index 406d8430b3..97a6508760 100644
--- a/ext/libav/gstavviddec.c
+++ b/ext/libav/gstavviddec.c
@@ -608,7 +608,6 @@ gst_ffmpegvideodec_prepare_dr_pool (GstFFMpegVidDec * ffmpegdec,
   gint width, height;
   gint linesize_align[4];
   gint i;
-  guint edge;
   gsize max_align;
 
   width = GST_VIDEO_INFO_WIDTH (info);
@@ -618,19 +617,10 @@ gst_ffmpegvideodec_prepare_dr_pool (GstFFMpegVidDec * ffmpegdec,
   avcodec_align_dimensions2 (ffmpegdec->context, &width, &height,
       linesize_align);
 
-  if (ffmpegdec->context->flags & CODEC_FLAG_EMU_EDGE)
-    edge = 0;
-  else
-    edge = avcodec_get_edge_width ();
-
-  /* increase the size for the padding */
-  width += edge << 1;
-  height += edge << 1;
-
-  align.padding_top = edge;
-  align.padding_left = edge;
-  align.padding_right = width - GST_VIDEO_INFO_WIDTH (info) - edge;
-  align.padding_bottom = height - GST_VIDEO_INFO_HEIGHT (info) - edge;
+  align.padding_top = 0;
+  align.padding_left = 0;
+  align.padding_right = width - GST_VIDEO_INFO_WIDTH (info);
+  align.padding_bottom = height - GST_VIDEO_INFO_HEIGHT (info);
 
   /* add extra padding to match libav buffer allocation sizes */
   align.padding_bottom++;