[vlc-commits] Revert "avcodec_get_edge_width() was added in libavcodec 52.66.0"

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sat Dec 10 22:30:46 2011 -0500| [704c3c6333447aeb644b739ad61c2fd287cafc8c] | committer: Rafaël Carré

Revert "avcodec_get_edge_width() was added in libavcodec 52.66.0"

This reverts commit 3c6bb18e81a62e8abb58ecd8b2df8549dea39729.

Revert "avcodec: fix direct rendering with some codecs"

This reverts commit fcc84608b67f3c3567b96604577bfdcc0de45b53.

The issue is not related to EMU_EDGE flag

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=704c3c6333447aeb644b739ad61c2fd287cafc8c
---

 modules/codec/avcodec/video.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 08f5331..c26c7a0 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -147,14 +147,8 @@ static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec,
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
 
-    unsigned edge = 0;
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 66, 0 )
-    if (p_sys->b_direct_rendering)
-        edge = avcodec_get_edge_width();
-#endif
-
-    p_dec->fmt_out.video.i_width = p_context->width + edge;
-    p_dec->fmt_out.video.i_height = p_context->height + edge;
+    p_dec->fmt_out.video.i_width = p_context->width;
+    p_dec->fmt_out.video.i_height = p_context->height;
 
     if( !p_context->width || !p_context->height )
     {