ffmpeg | branch: master | Anton Khirnov <an...@khirnov.net> | Thu Sep 22 08:40:05 2016 +0200| [7bf8db4db61eb09fac00eb665d8ec58de8817da6] | committer: Anton Khirnov
tdsc: use the new decoding API > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7bf8db4db61eb09fac00eb665d8ec58de8817da6 --- libavcodec/tdsc.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavcodec/tdsc.c b/libavcodec/tdsc.c index c70c77f..5b952b3 100644 --- a/libavcodec/tdsc.c +++ b/libavcodec/tdsc.c @@ -343,7 +343,6 @@ static int tdsc_decode_jpeg_tile(AVCodecContext *avctx, int tile_size, { TDSCContext *ctx = avctx->priv_data; AVPacket jpkt; - int got_frame = 0; int ret; /* Prepare a packet and send to the MJPEG decoder */ @@ -351,12 +350,16 @@ static int tdsc_decode_jpeg_tile(AVCodecContext *avctx, int tile_size, jpkt.data = ctx->tilebuffer; jpkt.size = tile_size; - ret = avcodec_decode_video2(ctx->jpeg_avctx, ctx->jpgframe, - &got_frame, &jpkt); - if (ret < 0 || !got_frame || ctx->jpgframe->format != AV_PIX_FMT_YUVJ420P) { + ret = avcodec_send_packet(ctx->jpeg_avctx, &jpkt); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Error submitting a packet for decoding\n"); + return ret; + } + + ret = avcodec_receive_frame(ctx->jpeg_avctx, ctx->jpgframe); + if (ret < 0 || ctx->jpgframe->format != AV_PIX_FMT_YUVJ420P) { av_log(avctx, AV_LOG_ERROR, - "JPEG decoding error (%d) for (%d) frame.\n", - ret, got_frame); + "JPEG decoding error (%d).\n", ret); /* Normally skip, error if explode */ if (avctx->err_recognition & AV_EF_EXPLODE) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
