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/mmsh.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/mmsh.c')
| -rw-r--r-- | libavformat/mmsh.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c index 38e6b319c6..16f07fec0e 100644 --- a/libavformat/mmsh.c +++ b/libavformat/mmsh.c @@ -124,7 +124,7 @@ static int read_data_packet(MMSHContext *mmsh, const int len) return AVERROR(EIO); } res = ffurl_read_complete(mms->mms_hd, mms->in_buffer, len); - av_dlog(NULL, "Data packet len = %d\n", len); + av_log(NULL, AV_LOG_TRACE, "Data packet len = %d\n", len); if (res != len) { av_log(NULL, AV_LOG_ERROR, "Read data packet failed!\n"); return AVERROR(EIO); @@ -158,7 +158,7 @@ static int get_http_header_data(MMSHContext *mmsh) if (mms->asf_header) { if (len != mms->asf_header_size) { mms->asf_header_size = len; - av_dlog(NULL, "Header len changed from %d to %d\n", + av_log(NULL, AV_LOG_TRACE, "Header len changed from %d to %d\n", mms->asf_header_size, len); av_freep(&mms->asf_header); } @@ -203,7 +203,7 @@ static int get_http_header_data(MMSHContext *mmsh) av_log(NULL, AV_LOG_ERROR, "Read other chunk type data failed!\n"); return AVERROR(EIO); } else { - av_dlog(NULL, "Skip chunk type %d \n", chunk_type); + av_log(NULL, AV_LOG_TRACE, "Skip chunk type %d \n", chunk_type); continue; } } @@ -291,7 +291,7 @@ static int mmsh_open_internal(URLContext *h, const char *uri, int flags, int tim av_log(NULL, AV_LOG_ERROR, "Build play request failed!\n"); goto fail; } - av_dlog(NULL, "out_buffer is %s", headers); + av_log(NULL, AV_LOG_TRACE, "out_buffer is %s", headers); av_opt_set(mms->mms_hd->priv_data, "headers", headers, 0); err = ffurl_connect(mms->mms_hd, NULL); @@ -305,12 +305,12 @@ static int mmsh_open_internal(URLContext *h, const char *uri, int flags, int tim goto fail; } - av_dlog(NULL, "Connection successfully open\n"); + av_log(NULL, AV_LOG_TRACE, "Connection successfully open\n"); return 0; fail: av_freep(&stream_selection); mmsh_close(h); - av_dlog(NULL, "Connection failed with error %d\n", err); + av_log(NULL, AV_LOG_TRACE, "Connection failed with error %d\n", err); return err; } |