[FFmpeg-cvslog] avcodec/tdsc: use ff_codec_open2_recursive()
Michael Niedermayer
git at videolan.org
Fri Mar 13 23:43:40 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 13 23:18:12 2015 +0100| [88ddcfa37f0067aae7457b44f433982f4c6d72ee] | committer: Michael Niedermayer
avcodec/tdsc: use ff_codec_open2_recursive()
Fixes assertion failure and race conditions
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88ddcfa37f0067aae7457b44f433982f4c6d72ee
---
libavcodec/tdsc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/tdsc.c b/libavcodec/tdsc.c
index 77af117..5b4e03f 100644
--- a/libavcodec/tdsc.c
+++ b/libavcodec/tdsc.c
@@ -125,7 +125,7 @@ static av_cold int tdsc_init(AVCodecContext *avctx)
ctx->jpeg_avctx->flags2 = avctx->flags2;
ctx->jpeg_avctx->dct_algo = avctx->dct_algo;
ctx->jpeg_avctx->idct_algo = avctx->idct_algo;;
- ret = avcodec_open2(ctx->jpeg_avctx, codec, NULL);
+ ret = ff_codec_open2_recursive(ctx->jpeg_avctx, codec, NULL);
if (ret < 0)
return ret;
More information about the ffmpeg-cvslog
mailing list