vlc | branch: master | Francois Cartegnie <[email protected]> | Tue Oct 1 15:33:33 2019 +0200| [4cf93db0818431060d82e4da7921280ff9e24fa0] | committer: Francois Cartegnie
packetizer: vc1: do not override container colors info (cherry picked from commit cda2db177d911a1327ec6dfcb3a223ff2809a59a) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4cf93db0818431060d82e4da7921280ff9e24fa0 --- modules/packetizer/vc1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/packetizer/vc1.c b/modules/packetizer/vc1.c index 4204350ddc..48624ceb14 100644 --- a/modules/packetizer/vc1.c +++ b/modules/packetizer/vc1.c @@ -582,7 +582,8 @@ static block_t *ParseIDU( decoder_t *p_dec, bool *pb_ts_used, block_t *p_frag ) if( !p_sys->b_sequence_header ) msg_Dbg( p_dec, "frame rate %d/%d", p_es->video.i_frame_rate, p_es->video.i_frame_rate_base ); } - if( bs_read1( &s ) ) /* Color Format */ + if( bs_read1( &s ) && /* Color Format */ + p_dec->fmt_in.video.primaries == COLOR_PRIMARIES_UNDEF ) { p_es->video.primaries = iso_23001_8_cp_to_vlc_primaries( bs_read( &s, 8 ) ); p_es->video.transfer = iso_23001_8_tc_to_vlc_xfer( bs_read( &s, 8 ) ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
