[vlc-commits] Revert "swscale: pass/calculate sar-info, should fix #7437"

Rémi Denis-Courmont git at videolan.org
Thu Nov 29 23:07:14 CET 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Nov 30 00:04:33 2012 +0200| [b8f04c94af923a1f39b529b907dc0ca6e527e061] | committer: Rémi Denis-Courmont

Revert "swscale: pass/calculate sar-info, should fix #7437"

This reverts commit 0330378c55b8b940f6de82adb59cc32c5b3da12a.
This reverts commit 0f233f4980d0440b8357de629fee7fa0741c27b3.

Init() already initializes the aspect ratio, and does it correctly
(unlike these two commits) with video_format_ScaleCropAr().

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

 modules/video_filter/croppadd.c |    3 ---
 modules/video_filter/swscale.c  |    3 ---
 2 files changed, 6 deletions(-)

diff --git a/modules/video_filter/croppadd.c b/modules/video_filter/croppadd.c
index 038ff7d..b4f2f2d 100644
--- a/modules/video_filter/croppadd.c
+++ b/modules/video_filter/croppadd.c
@@ -190,9 +190,6 @@ static int OpenFilter( vlc_object_t *p_this )
              p_filter->fmt_out.video.i_width,
              p_filter->fmt_out.video.i_height );
 
-    p_filter->fmt_out.video.i_sar_num = p_filter->fmt_in.video.i_sar_num * p_filter->fmt_out.video.i_visible_height;
-    p_filter->fmt_out.video.i_sar_den = p_filter->fmt_in.video.i_sar_den * p_filter->fmt_out.video.i_visible_width;
-
     return VLC_SUCCESS;
 }
 
diff --git a/modules/video_filter/swscale.c b/modules/video_filter/swscale.c
index 7854a30..d7ef3ba 100644
--- a/modules/video_filter/swscale.c
+++ b/modules/video_filter/swscale.c
@@ -207,9 +207,6 @@ static int OpenScaler( vlc_object_t *p_this )
              (char *)&p_filter->fmt_out.video.i_chroma,
              ppsz_mode_descriptions[i_sws_mode] );
 
-    p_filter->fmt_out.video.i_sar_num = p_filter->fmt_in.video.i_sar_num * p_filter->fmt_in.video.i_width / p_filter->fmt_out.video.i_width;
-    p_filter->fmt_out.video.i_sar_den = p_filter->fmt_in.video.i_sar_den * p_filter->fmt_in.video.i_height / p_filter->fmt_out.video.i_height;
-
     return VLC_SUCCESS;
 }
 



More information about the vlc-commits mailing list