[vlc-devel] [PATCH 1/2] Revert "Fixed AR setting for dvdsimple, support AR for dvdnav."

[Rémi Denis-Courmont]

This reverts commit 9901a6edca1a7c28c461f2c57da6f37ce4671289.
This appears to break DVD menus.
---
 modules/access/dvdnav.c  |    5 +----
 modules/access/dvdread.c |   10 ++--------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 6ab93b7..cfc6fdb 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -1161,10 +1161,7 @@ static void ESNew( demux_t *p_demux, int i_id )
     {
         switch( p_sys->i_aspect )
         {
-        case 1: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR; break;
-        case 2: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * 4 / 3; break;
-        case 3: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * 16 / 9; break;
-        case 4: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * 221 / 10; break;
+        /* XXX We need the video size to support it */
         default:
             tk->fmt.video.i_aspect = 0;
             break;
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 48671c5..a918dc9 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -710,15 +710,9 @@ static void ESNew( demux_t *p_demux, int i_id, int i_lang )
     /* Add a new ES */
     if( tk->fmt.i_cat == VIDEO_ES )
     {
-        switch( p_sys->i_aspect )
+        if( p_sys->i_aspect >= 0 )
         {
-        case 1: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR; break;
-        case 2: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * 4 / 3; break;
-        case 3: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * 16 / 9; break;
-        case 4: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * 221 / 10; break;
-        default:
-            tk->fmt.video.i_aspect = 0;
-            break;
+            tk->fmt.video.i_aspect = p_sys->i_aspect;
         }
     }
     else if( tk->fmt.i_cat == AUDIO_ES )
-- 
1.5.6.5