From: Jan Sebechlebsky <sebechlebsky...@gmail.com>
This fixes ticket #5487 - mjpeg2jpeg bitstream filter causes
segmentation fault with header-less mjpeg.
Signed-off-by: Jan Sebechlebsky <sebechlebsky...@gmail.com>
---
libavcodec/mjpeg2jpeg_bsf.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/mjpeg2jpeg_bsf.c b/libavcodec/mjpeg2jpeg_bsf.c
index 2d4cee2..c4b5050 100644
--- a/libavcodec/mjpeg2jpeg_bsf.c
+++ b/libavcodec/mjpeg2jpeg_bsf.c
@@ -85,7 +85,9 @@ static int mjpeg2jpeg_filter(AVBSFContext *ctx, AVPacket *out)
int input_skip, output_size;
uint8_t *output;
- ret = ff_bsf_get_packet(ctx, &in);
+ if ((ret = ff_bsf_get_packet(ctx, &in)) < 0) {
+ return ret;
+ }
if (in->size < 12) {
av_log(ctx, AV_LOG_ERROR, "input is truncated\n");
--
1.9.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
