X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fcdg.c;h=31ecd0e55fc1dda9ddd51c58dd0224a24251bb4d;hb=127b903cc18290db5712f2fd25af1219d4c8808f;hp=8b3d574e59ea275670e967c5f4fa79eac30d3f89;hpb=152b1687c0ec112f3ab1360006d048d6b9cf7258;p=vlc diff --git a/modules/codec/cdg.c b/modules/codec/cdg.c index 8b3d574e59..31ecd0e55f 100644 --- a/modules/codec/cdg.c +++ b/modules/codec/cdg.c @@ -116,8 +116,8 @@ static int Open( vlc_object_t *p_this ) p_dec->fmt_out.i_codec = VLC_CODEC_RGB32; p_dec->fmt_out.video.i_width = CDG_DISPLAY_WIDTH; p_dec->fmt_out.video.i_height = CDG_DISPLAY_HEIGHT; - p_dec->fmt_out.video.i_aspect = - VOUT_ASPECT_FACTOR * p_dec->fmt_out.video.i_width / p_dec->fmt_out.video.i_height; + p_dec->fmt_out.video.i_sar_num = 1; + p_dec->fmt_out.video.i_sar_den = 1; p_dec->fmt_out.video.i_rmask = 0xff << CDG_COLOR_R_SHIFT; p_dec->fmt_out.video.i_gmask = 0xff << CDG_COLOR_G_SHIFT; p_dec->fmt_out.video.i_bmask = 0xff << CDG_COLOR_B_SHIFT; @@ -166,7 +166,7 @@ static picture_t *Decode( decoder_t *p_dec, block_t **pp_block ) goto exit; Render( p_sys, p_pic ); - p_pic->date = p_block->i_pts > 0 ? p_block->i_pts : p_block->i_dts; + p_pic->date = p_block->i_pts > VLC_TS_INVALID ? p_block->i_pts : p_block->i_dts; } exit: