vlc | branch: master | Thomas Guillem <[email protected]> | Thu Mar 23 17:36:19 2017 +0100| [0acb06afb69b171937b2803cf8b188b847b90917] | committer: Thomas Guillem
packetizer: h264: remove unused function > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0acb06afb69b171937b2803cf8b188b847b90917 --- modules/packetizer/h264_nal.c | 14 -------------- modules/packetizer/h264_nal.h | 8 +------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/modules/packetizer/h264_nal.c b/modules/packetizer/h264_nal.c index db494bf..f7b189d 100644 --- a/modules/packetizer/h264_nal.c +++ b/modules/packetizer/h264_nal.c @@ -671,20 +671,6 @@ block_t *h264_NAL_to_avcC( uint8_t i_nal_length_size, return bo.b; } -block_t *h264_AnnexB_NAL_to_avcC( uint8_t i_nal_length_size, - const uint8_t *p_sps_buf, - size_t i_sps_size, - const uint8_t *p_pps_buf, - size_t i_pps_size ) -{ - if( !hxxx_strip_AnnexB_startcode( &p_sps_buf, &i_sps_size ) || - !hxxx_strip_AnnexB_startcode( &p_pps_buf, &i_pps_size ) ) - return NULL; - return h264_NAL_to_avcC( i_nal_length_size, - p_sps_buf, i_sps_size, - p_pps_buf, i_pps_size ); -} - static const h264_level_limits_t * h264_get_level_limits( const h264_sequence_parameter_set_t *p_sps ) { uint16_t i_level_number = p_sps->i_level; diff --git a/modules/packetizer/h264_nal.h b/modules/packetizer/h264_nal.h index 6327055..c83be4e 100644 --- a/modules/packetizer/h264_nal.h +++ b/modules/packetizer/h264_nal.h @@ -168,14 +168,8 @@ bool h264_AnnexB_get_spspps( const uint8_t *p_buf, size_t i_buf, const uint8_t **pp_pps, size_t *p_pps_size, const uint8_t **pp_ext, size_t *p_ext_size ); -/* Create a AVCDecoderConfigurationRecord from SPS/PPS +/* Create a AVCDecoderConfigurationRecord from non prefixed SPS/PPS * Returns a valid block_t on success, must be freed with block_Release */ -block_t *h264_AnnexB_NAL_to_avcC( uint8_t i_nal_length_size, - const uint8_t *p_sps_buf, - size_t i_sps_size, - const uint8_t *p_pps_buf, - size_t i_pps_size ); -/* Same from raw / non prefixed NAL */ block_t *h264_NAL_to_avcC( uint8_t i_nal_length_size, const uint8_t *p_sps_buf, size_t i_sps_size, _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
