vlc | branch: master | Thomas Guillem <[email protected]> | Thu Jul 30 10:05:32 2015 +0200| [6f1334f17053e8e589732a676f64cea8314a3cce] | committer: Thomas Guillem
videotoolbox: fail if convert_sps_pps fails This partially revert 1af77eb55a9606970114de01872099937f87b4f1 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6f1334f17053e8e589732a676f64cea8314a3cce --- modules/codec/videotoolbox.m | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m index b2a250f..52ea113 100644 --- a/modules/codec/videotoolbox.m +++ b/modules/codec/videotoolbox.m @@ -264,14 +264,14 @@ static int StartVideoToolbox(decoder_t *p_dec, block_t *p_block) /* we need to convert the SPS and PPS units we received from the * demuxer's avvC atom so we can process them further */ - if (convert_sps_pps(p_dec, - p_dec->fmt_in.p_extra, - p_dec->fmt_in.i_extra, - p_buf, - buf_size, - &size, - &i_nal_size) == VLC_SUCCESS) - p_sys->b_is_avcc = i_nal_size > 0; + i_ret = convert_sps_pps(p_dec, + p_dec->fmt_in.p_extra, + p_dec->fmt_in.i_extra, + p_buf, + buf_size, + &size, + &i_nal_size); + p_sys->b_is_avcc = i_ret == VLC_SUCCESS; } else { /* we are mid-stream, let's have the h264_get helper see if it * can find a NAL unit */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
