[vlc-commits] mediacodec: remove texture in video context

Alexandre Janniaux git at videolan.org
Thu Jan 14 09:40:59 UTC 2021


vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Wed Jan 13 12:07:21 2021 +0100| [1954848073301fb4eef137859714f14c6a66fdc0] | committer: Alexandre Janniaux

mediacodec: remove texture in video context

This is not used anymore.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1954848073301fb4eef137859714f14c6a66fdc0
---

 modules/codec/omxil/mediacodec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c
index 9741248614..b021f87afe 100644
--- a/modules/codec/omxil/mediacodec.c
+++ b/modules/codec/omxil/mediacodec.c
@@ -698,7 +698,6 @@ CreateVideoContext(decoder_t *p_dec)
 
     android_video_context_t *avctx =
         vlc_video_context_GetPrivate(p_sys->video.ctx, VLC_VIDEO_CONTEXT_AWINDOW);
-    avctx->texture = p_sys->video.surfacetexture;
     avctx->dec_opaque = p_dec->p_sys;
     avctx->render = PictureContextRenderPic;
     avctx->render_ts = p_sys->api.release_out_ts ? PictureContextRenderPicTs : NULL;
@@ -1118,6 +1117,7 @@ static int Video_ProcessOutput(decoder_t *p_dec, mc_api_out *p_out,
             struct android_picture_ctx *apctx =
                 GetPictureContext(p_dec,p_out->buf.i_index);
             assert(apctx);
+            assert(apctx->s.vctx);
             vlc_video_context_Hold(apctx->s.vctx);
             p_pic->context = &apctx->s;
         } else {



More information about the vlc-commits mailing list