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/flvdec.c | |
| parent | 8e8219e0f0725116809cdd1c17c868cb08da0dec (diff) | |
| parent | 1a3eb042c704dea190c644def5b32c9cee8832b8 (diff) | |
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/flvdec.c')
| -rw-r--r-- | libavformat/flvdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index b625c787a5..07f7b681e9 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -798,7 +798,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) size = avio_rb24(s->pb); dts = avio_rb24(s->pb); dts |= avio_r8(s->pb) << 24; - av_dlog(s, "type:%d, size:%d, dts:%"PRId64" pos:%"PRId64"\n", type, size, dts, avio_tell(s->pb)); + av_log(s, AV_LOG_TRACE, "type:%d, size:%d, dts:%"PRId64" pos:%"PRId64"\n", type, size, dts, avio_tell(s->pb)); if (avio_feof(s->pb)) return AVERROR_EOF; avio_skip(s->pb, 3); /* stream id, always 0 */ @@ -888,7 +888,7 @@ skip: return AVERROR(ENOMEM); } - av_dlog(s, "%d %X %d \n", stream_type, flags, st->discard); + av_log(s, AV_LOG_TRACE, "%d %X %d \n", stream_type, flags, st->discard); if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || stream_type == FLV_STREAM_TYPE_AUDIO) @@ -1017,7 +1017,7 @@ retry_duration: st->codec->sample_rate = cfg.ext_sample_rate; else st->codec->sample_rate = cfg.sample_rate; - av_dlog(s, "mp4a config channels %d sample rate %d\n", + av_log(s, AV_LOG_TRACE, "mp4a config channels %d sample rate %d\n", st->codec->channels, st->codec->sample_rate); } } |