On Thu, Sep 22, 2016 at 3:35 AM, Anton Khirnov <an...@khirnov.net> wrote:
> ---
>  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)
> --

lgtm
-- 
Vittorio
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to