X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=encoder%2Fset.c;h=e752a52e19bdac3ed23fc0b8d4a07202acd30915;hb=27a7b05b8330d0756e5e3f6669282561030f54fa;hp=5e1ff642a53e68fdaac93a874b9d893674f309c4;hpb=5b0cb86f27ba0c5433c404bed51c06a5124dfb49;p=x264 diff --git a/encoder/set.c b/encoder/set.c index 5e1ff642..e752a52e 100644 --- a/encoder/set.c +++ b/encoder/set.c @@ -1,7 +1,7 @@ /***************************************************************************** * set: header writing ***************************************************************************** - * Copyright (C) 2003-2011 x264 project + * Copyright (C) 2003-2012 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -278,7 +278,7 @@ void x264_sps_write( bs_t *s, x264_sps_t *sps ) if( sps->i_profile_idc >= PROFILE_HIGH ) { bs_write_ue( s, sps->i_chroma_format_idc ); - if( sps->i_chroma_format_idc == 3 ) + if( sps->i_chroma_format_idc == CHROMA_444 ) bs_write1( s, 0 ); // separate_colour_plane_flag bs_write_ue( s, BIT_DEPTH-8 ); // bit_depth_luma_minus8 bs_write_ue( s, BIT_DEPTH-8 ); // bit_depth_chroma_minus8 @@ -515,7 +515,7 @@ void x264_pps_write( bs_t *s, x264_sps_t *sps, x264_pps_t *pps ) bs_write1( s, 0 ); // Cr = Cb if( pps->b_transform_8x8_mode ) { - if( sps->i_chroma_format_idc == 3 ) + if( sps->i_chroma_format_idc == CHROMA_444 ) { scaling_list_write( s, pps, CQM_8IY+4 ); scaling_list_write( s, pps, CQM_8IC+4 ); @@ -575,7 +575,7 @@ int x264_sei_version_write( x264_t *h, bs_t *s ) memcpy( payload, uuid, 16 ); sprintf( payload+16, "x264 - core %d%s - H.264/MPEG-4 AVC codec - " - "Copy%s 2003-2011 - http://www.videolan.org/x264.html - options: %s", + "Copy%s 2003-2012 - http://www.videolan.org/x264.html - options: %s", X264_BUILD, X264_VERSION, HAVE_GPL?"left":"right", opts ); length = strlen(payload)+1;