[FFmpeg-cvslog] lavf/mpjpegdec: Do not call av_log() while probing.
Carl Eugen Hoyos
git at videolan.org
Tue Jan 12 20:36:52 CET 2016
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Jan 12 20:35:03 2016 +0100| [405abdbaee5239e301d3ed5370b059f9b0c2da16] | committer: Carl Eugen Hoyos
lavf/mpjpegdec: Do not call av_log() while probing.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=405abdbaee5239e301d3ed5370b059f9b0c2da16
---
libavformat/mpjpegdec.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c
index dd31f87..c9fcf47 100644
--- a/libavformat/mpjpegdec.c
+++ b/libavformat/mpjpegdec.c
@@ -198,6 +198,7 @@ static int parse_multipart_header(AVIOContext *pb,
}
if (!av_strstart(line, expected_boundary, NULL)) {
+ if (log_ctx)
av_log(log_ctx,
AV_LOG_ERROR,
"Expected boundary '%s' not found, instead found a line of %zu bytes\n",
@@ -228,6 +229,7 @@ static int parse_multipart_header(AVIOContext *pb,
if (!av_strcasecmp(tag, "Content-type")) {
if (av_strcasecmp(value, "image/jpeg")) {
+ if (log_ctx)
av_log(log_ctx, AV_LOG_ERROR,
"Unexpected %s : %s\n",
tag, value);
@@ -237,6 +239,7 @@ static int parse_multipart_header(AVIOContext *pb,
} else if (!av_strcasecmp(tag, "Content-Length")) {
*size = parse_content_length(value);
if ( *size < 0 )
+ if (log_ctx)
av_log(log_ctx, AV_LOG_WARNING,
"Invalid Content-Length value : %s\n",
value);
More information about the ffmpeg-cvslog
mailing list