Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0'

[ffmpeg] / libavcodec / mjpeg2jpeg_bsf.c

diff --git a/libavcodec/mjpeg2jpeg_bsf.c b/libavcodec/mjpeg2jpeg_bsf.c
index 2d4cee2ac1bfc6fcb1c78946720fd36379bc90ca..6f02bc033caaa073a9d2f7ebcdd589cdfda19122 100644 (file)
--- a/libavcodec/mjpeg2jpeg_bsf.c
+++ b/libavcodec/mjpeg2jpeg_bsf.c
@@ -86,6 +86,8 @@ static int mjpeg2jpeg_filter(AVBSFContext *ctx, AVPacket *out)
     uint8_t *output;
 
     ret = ff_bsf_get_packet(ctx, &in);
+    if (ret < 0)
+        return ret;
 
     if (in->size < 12) {
         av_log(ctx, AV_LOG_ERROR, "input is truncated\n");