X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fts.c;h=180507ad5deb3dabfd3b091a168e22cdbcb94c63;hb=7f12470415d98e9e0ac725f2bb96b5fa74ef27f1;hp=be3cd884a980007dc30b15fc8253f5d96ce5ff4d;hpb=a516ab36c1891b7afbc7531ee0cdee480e36c631;p=vlc diff --git a/modules/demux/ts.c b/modules/demux/ts.c index be3cd884a9..180507ad5d 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -3217,7 +3217,8 @@ static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid, ts_teletext_page_t *p_dst = &p_page[i_page++]; p_dst->i_type = p_src->i_teletext_type; - p_dst->i_magazine = p_src->i_teletext_magazine_number ? : 8; + p_dst->i_magazine = p_src->i_teletext_magazine_number + ? p_src->i_teletext_magazine_number : 8; p_dst->i_page = p_src->i_teletext_page_number; memcpy( p_dst->p_iso639, p_src->i_iso6392_language_code, 3 ); } @@ -3250,7 +3251,8 @@ static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid, break; } /* FIXME check if it is the right split */ - p_dst->i_magazine = (p_src->i_composition_page_id >> 8) ? : 8; + p_dst->i_magazine = (p_src->i_composition_page_id >> 8) + ? (p_src->i_composition_page_id >> 8) : 8; p_dst->i_page = p_src->i_composition_page_id & 0xff; memcpy( p_dst->p_iso639, p_src->i_iso6392_language_code, 3 ); }