RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/v4l2_m2m_dec: Fix decoding on Odroid XU4 

c0c7946196 unintentianally changed the initialization flow of the
decoder: It caused the capture buffers to be initialized on
v4l2_m2m.c:180 in v4l2_configure_contexts(). This breaks h264 decoding
on the Odroid XU4 (RPI4 was not affected).

This commit postpones capture buffer initialization
as before c0c7946196 to fix the issue.

Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
Signed-off-by: Aman Gupta <aman@tmm1.net>
This commit is contained in:
Andriy Gelman 2019-11-12 00:37:02 -05:00 committed by Aman Gupta
parent f2a01b4c8b
commit ccc83ff11e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/v4l2_m2m_dec.c
View File

@ -201,6 +201,7 @@ static av_cold int v4l2_decode_init(AVCodecContext *avctx)
capture->av_codec_id = AV_CODEC_ID_RAWVIDEO; capture->av_codec_id = AV_CODEC_ID_RAWVIDEO;
capture->av_pix_fmt = avctx->pix_fmt; capture->av_pix_fmt = avctx->pix_fmt;
s->avctx = avctx;
ret = ff_v4l2_m2m_codec_init(priv); ret = ff_v4l2_m2m_codec_init(priv);
if (ret) { if (ret) {
av_log(avctx, AV_LOG_ERROR, "can't configure decoder\n"); av_log(avctx, AV_LOG_ERROR, "can't configure decoder\n");
@ -209,7 +210,6 @@ static av_cold int v4l2_decode_init(AVCodecContext *avctx)
return ret; return ret;
} }
s->avctx = avctx;
return v4l2_prepare_decoder(s); return v4l2_prepare_decoder(s);
} }