vlc | branch: master | Thomas Guillem <tho...@gllm.fr> | Thu Apr 20 11:29:31 2017 +0200| [254015dd0a6fe3cd7fa1cc8042ee216dd1ae00b9] | committer: Thomas Guillem
codec: hxxx: move code > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=254015dd0a6fe3cd7fa1cc8042ee216dd1ae00b9 --- modules/codec/hxxx_helper.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/codec/hxxx_helper.c b/modules/codec/hxxx_helper.c index 606f5e6327..16479bcdae 100644 --- a/modules/codec/hxxx_helper.c +++ b/modules/codec/hxxx_helper.c @@ -354,18 +354,6 @@ hevc_helper_set_extra(struct hxxx_helper *hh, const void *p_extra, } static block_t * -helper_process_block_xvcc2annexb(struct hxxx_helper *hh, block_t *p_block, - bool *p_config_changed) -{ - assert(helper_nal_length_valid(hh)); - if (p_config_changed != NULL) - *p_config_changed = false; - h264_AVC_to_AnnexB(p_block->p_buffer, p_block->i_buffer, - hh->i_nal_length_size); - return p_block; -} - -static block_t * helper_process_block_h264_annexb(struct hxxx_helper *hh, block_t *p_block, bool *p_config_changed) { @@ -383,6 +371,18 @@ helper_process_block_h264_annexb(struct hxxx_helper *hh, block_t *p_block, } static block_t * +helper_process_block_xvcc2annexb(struct hxxx_helper *hh, block_t *p_block, + bool *p_config_changed) +{ + assert(helper_nal_length_valid(hh)); + if (p_config_changed != NULL) + *p_config_changed = false; + h264_AVC_to_AnnexB(p_block->p_buffer, p_block->i_buffer, + hh->i_nal_length_size); + return p_block; +} + +static block_t * helper_process_block_h264_annexb2avcc(struct hxxx_helper *hh, block_t *p_block, bool *p_config_changed) { _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits