Put an AVIOContext whose lifetime doesn't extend beyond the function where
it is allocated on the stack instead of allocating and freeing it.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com>
---
libavformat/mpjpegdec.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c
index e653b5cc93..84130ab718 100644
--- a/libavformat/mpjpegdec.c
+++ b/libavformat/mpjpegdec.c
@@ -113,20 +113,16 @@ static int mpjpeg_read_close(AVFormatContext *s)
static int mpjpeg_read_probe(const AVProbeData *p)
{
- AVIOContext *pb;
+ AVIOContext pb;
int ret = 0;
int size = 0;
if (p->buf_size < 2 || p->buf[0] != '-' || p->buf[1] != '-')
return 0;
- pb = avio_alloc_context(p->buf, p->buf_size, 0, NULL, NULL, NULL, NULL);
- if (!pb)
- return 0;
-
- ret = (parse_multipart_header(pb, &size, "--", NULL) >= 0) ?
AVPROBE_SCORE_MAX : 0;
+ ffio_init_context(&pb, p->buf, p->buf_size, 0, NULL, NULL, NULL, NULL);
- avio_context_free(&pb);
+ ret = (parse_multipart_header(&pb, &size, "--", NULL) >= 0) ?
AVPROBE_SCORE_MAX : 0;
return ret;
}
--
2.20.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
