Commit a208a90a authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

dcp: Remove unrequired checks

CID #1463257 #1463249

(cherry picked from commit f9e30b38)
Signed-off-by: default avatarHugo Beauzée-Luyssen <hugo@beauzee.fr>
parent 1d9fbd06
...@@ -638,10 +638,8 @@ static int Demux( demux_t *p_demux ) ...@@ -638,10 +638,8 @@ static int Demux( demux_t *p_demux )
/* video frame */ /* video frame */
/* initialize AES context, if reel is encrypted */ /* initialize AES context, if reel is encrypted */
if( p_sys && if( p_sys->p_dcp->video_reels.size() > p_sys->i_video_reel &&
p_sys->p_dcp && p_sys->p_dcp->video_reels[p_sys->i_video_reel].p_key )
p_sys->p_dcp->video_reels.size() > p_sys->i_video_reel &&
p_sys->p_dcp->video_reels[p_sys->i_video_reel].p_key )
{ {
if( ! ASDCP_SUCCESS( video_aes_ctx.InitKey( p_sys->p_dcp->video_reels[p_sys->i_video_reel].p_key->getKey() ) ) ) if( ! ASDCP_SUCCESS( video_aes_ctx.InitKey( p_sys->p_dcp->video_reels[p_sys->i_video_reel].p_key->getKey() ) ) )
{ {
...@@ -712,10 +710,8 @@ static int Demux( demux_t *p_demux ) ...@@ -712,10 +710,8 @@ static int Demux( demux_t *p_demux )
} }
/* initialize AES context, if reel is encrypted */ /* initialize AES context, if reel is encrypted */
if( p_sys && if( p_sys->p_dcp->audio_reels.size() > p_sys->i_audio_reel &&
p_sys->p_dcp && p_sys->p_dcp->audio_reels[p_sys->i_audio_reel].p_key )
p_sys->p_dcp->audio_reels.size() > p_sys->i_audio_reel &&
p_sys->p_dcp->audio_reels[p_sys->i_audio_reel].p_key )
{ {
if( ! ASDCP_SUCCESS( audio_aes_ctx.InitKey( p_sys->p_dcp->audio_reels[p_sys->i_audio_reel].p_key->getKey() ) ) ) if( ! ASDCP_SUCCESS( audio_aes_ctx.InitKey( p_sys->p_dcp->audio_reels[p_sys->i_audio_reel].p_key->getKey() ) ) )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment