Commit bb466df9 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by Jean-Paul Saman

avcodec: allow hardware acceleration plugin to use pic->opaque

(cherry picked from commit 3d29910e66214abb38d72a5d8172c4402144eb0d)

Conflicts:
	modules/codec/avcodec/video.c
parent 87851990
...@@ -720,7 +720,7 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) ...@@ -720,7 +720,7 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
* if needed */ * if needed */
ffmpeg_CopyPicture( p_dec, p_pic, p_sys->p_ff_pic ); ffmpeg_CopyPicture( p_dec, p_pic, p_sys->p_ff_pic );
} }
else if( !p_sys->p_ff_pic->opaque ) else if( p_sys->p_va != NULL || p_sys->p_ff_pic->opaque == NULL )
{ {
/* Get a new picture */ /* Get a new picture */
p_pic = ffmpeg_NewPictBuf( p_dec, p_context ); p_pic = ffmpeg_NewPictBuf( p_dec, p_context );
......
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