Skip to content

V
vlc
Commit 9901a6ed authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed AR setting for dvdsimple, support AR for dvdnav.

parent 06aa9433
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 3 deletions
modules/access/dvdnav.c
View file @ 9901a6ed
...@@ -1143,7 +1143,10 @@ static void ESNew( demux_t *p_demux, int i_id ) ...@@ -1143,7 +1143,10 @@ static void ESNew( demux_t *p_demux, int i_id )
{ {
switch( p_sys->i_aspect ) switch( p_sys->i_aspect )
{ {
/* XXX We need the video size to support it */ 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: default:
tk->fmt.video.i_aspect = 0; tk->fmt.video.i_aspect = 0;
break; break;
......
modules/access/dvdread.c
View file @ 9901a6ed
...@@ -710,9 +710,15 @@ static void ESNew( demux_t *p_demux, int i_id, int i_lang ) ...@@ -710,9 +710,15 @@ static void ESNew( demux_t *p_demux, int i_id, int i_lang )
/* Add a new ES */ /* Add a new ES */
if( tk->fmt.i_cat == VIDEO_ES ) if( tk->fmt.i_cat == VIDEO_ES )
{ {
if( p_sys->i_aspect >= 0 ) switch( p_sys->i_aspect )
{ {
tk->fmt.video.i_aspect = 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;
default:
tk->fmt.video.i_aspect = 0;
break;
} }
} }
else if( tk->fmt.i_cat == AUDIO_ES ) else if( tk->fmt.i_cat == AUDIO_ES )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment