diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 03:19:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 03:19:47 +0200 |
| commit | 40d552dae657d2d690a724c8b1e7ea714998d74f (patch) | |
| tree | 43534ea3562526771f95b821b9e8cbbd7573d24e /libavformat/http.c | |
| parent | 8e8219e0f0725116809cdd1c17c868cb08da0dec (diff) | |
| parent | 1a3eb042c704dea190c644def5b32c9cee8832b8 (diff) | |
| download | ffmpeg-40d552dae657d2d690a724c8b1e7ea714998d74f.tar.gz | |
Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
Replace av_dlog with normal av_log at trace level
Conflicts:
ffplay.c
libavdevice/fbdev_dec.c
libavfilter/avfilter.c
libavfilter/internal.h
libavfilter/setpts.c
libavfilter/src_movie.c
libavfilter/vf_crop.c
libavfilter/vf_drawtext.c
libavfilter/vf_fieldorder.c
libavformat/assdec.c
libavformat/avidec.c
libavformat/flvdec.c
libavformat/http.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/mov.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mux.c
libavformat/mxfdec.c
libavformat/nsvdec.c
libavformat/oggdec.c
libavformat/r3d.c
libavformat/rtspdec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/http.c')
| -rw-r--r-- | libavformat/http.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index 02153d5792..acf031898a 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -559,7 +559,7 @@ static int process_line(URLContext *h, char *line, int line_count, p++; s->http_code = strtol(p, &end, 10); - av_log(h, AV_LOG_DEBUG, "http_code=%d\n", s->http_code); + av_log(h, AV_LOG_TRACE, "http_code=%d\n", s->http_code); if ((ret = check_http_code(h, s->http_code, end)) < 0) return ret; @@ -748,7 +748,7 @@ static int http_read_header(URLContext *h, int *new_location) if ((err = http_get_line(s, line, sizeof(line))) < 0) return err; - av_log(h, AV_LOG_DEBUG, "header='%s'\n", line); + av_log(h, AV_LOG_TRACE, "header='%s'\n", line); err = process_line(h, line, s->line_count, new_location); if (err < 0) @@ -1020,7 +1020,7 @@ static int http_read_stream(URLContext *h, uint8_t *buf, int size) s->chunksize = strtoll(line, NULL, 16); - av_dlog(NULL, "Chunked encoding data size: %"PRId64"'\n", + av_log(NULL, AV_LOG_TRACE, "Chunked encoding data size: %"PRId64"'\n", s->chunksize); if (!s->chunksize) |