[vlc-commits] Fixed zvbi subpictures AR.

[Laurent Aimar]

vlc/vlc-1.2 | branch: master | Laurent Aimar <fenrir at videolan.org> | Thu Jan  5 21:52:59 2012 +0100| [a7958769099b1b5d3224ef4a2d0d32c23974d036] | committer: Jean-Baptiste Kempf

Fixed zvbi subpictures AR.
(cherry picked from commit 4343ec78a1fd2af33549d26c0e6bdd2702148ba8)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/codec/zvbi.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 3b02ae9..e8f8cf4 100644
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -462,18 +462,15 @@ static subpicture_t *Subpicture( decoder_t *p_dec, video_format_t *p_fmt,
     }
 
     memset( &fmt, 0, sizeof(video_format_t) );
-    fmt.i_chroma = b_text ? VLC_CODEC_TEXT :
-                                   VLC_CODEC_RGBA;
+    fmt.i_chroma = b_text ? VLC_CODEC_TEXT : VLC_CODEC_RGBA;
+    fmt.i_sar_num = 0;
+    fmt.i_sar_den = 1;
     if( b_text )
     {
         fmt.i_bits_per_pixel = 0;
-        fmt.i_sar_num = 0;
-        fmt.i_sar_den = 0;
     }
     else
     {
-        fmt.i_sar_num = 1;
-        fmt.i_sar_den = 1;
         fmt.i_width = fmt.i_visible_width = i_columns * 12;
         fmt.i_height = fmt.i_visible_height = i_rows * 10;
         fmt.i_bits_per_pixel = 32;