summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2016-01-12 20:35:03 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2016-01-12 20:35:03 +0100
commit405abdbaee5239e301d3ed5370b059f9b0c2da16 (patch)
treec2bc02c7c398764d75a79f2a9409ec232be5342f /libavformat
parent7c0b84d89911b2035161f5ef51aafbfcc84aa9e2 (diff)
downloadffmpeg-405abdbaee5239e301d3ed5370b059f9b0c2da16.tar.gz
lavf/mpjpegdec: Do not call av_log() while probing.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mpjpegdec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c
index dd31f87d69..c9fcf47f1e 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);