RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf/mpjpegdec: Do not call av_log() while probing.

This commit is contained in:
Carl Eugen Hoyos 2016-01-12 20:35:03 +01:00
parent 7c0b84d899
commit 405abdbaee
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/mpjpegdec.c
View File

@ -198,6 +198,7 @@ static int parse_multipart_header(AVIOContext *pb,
} }
if (!av_strstart(line, expected_boundary, NULL)) { if (!av_strstart(line, expected_boundary, NULL)) {
if (log_ctx)
av_log(log_ctx, av_log(log_ctx,
AV_LOG_ERROR, AV_LOG_ERROR,
"Expected boundary '%s' not found, instead found a line of %zu bytes\n", "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(tag, "Content-type")) {
if (av_strcasecmp(value, "image/jpeg")) { if (av_strcasecmp(value, "image/jpeg")) {
if (log_ctx)
av_log(log_ctx, AV_LOG_ERROR, av_log(log_ctx, AV_LOG_ERROR,
"Unexpected %s : %s\n", "Unexpected %s : %s\n",
tag, value); tag, value);
@ -237,6 +239,7 @@ static int parse_multipart_header(AVIOContext *pb,
} else if (!av_strcasecmp(tag, "Content-Length")) { } else if (!av_strcasecmp(tag, "Content-Length")) {
*size = parse_content_length(value); *size = parse_content_length(value);
if ( *size < 0 ) if ( *size < 0 )
if (log_ctx)
av_log(log_ctx, AV_LOG_WARNING, av_log(log_ctx, AV_LOG_WARNING,
"Invalid Content-Length value : %s\n", "Invalid Content-Length value : %s\n",
value); value);