aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mpegtsenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-20 03:19:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-20 03:19:47 +0200
commit40d552dae657d2d690a724c8b1e7ea714998d74f (patch)
tree43534ea3562526771f95b821b9e8cbbd7573d24e /libavformat/mpegtsenc.c
parent8e8219e0f0725116809cdd1c17c868cb08da0dec (diff)
parent1a3eb042c704dea190c644def5b32c9cee8832b8 (diff)
downloadandroid_external_ffmpeg-40d552dae657d2d690a724c8b1e7ea714998d74f.tar.gz
android_external_ffmpeg-40d552dae657d2d690a724c8b1e7ea714998d74f.tar.bz2
android_external_ffmpeg-40d552dae657d2d690a724c8b1e7ea714998d74f.zip
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/mpegtsenc.c')
-rw-r--r--libavformat/mpegtsenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 0251e7aba8..9efa9fc362 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -1281,7 +1281,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
do {
p = avpriv_find_start_code(p, buf_end, &state);
- av_dlog(s, "nal %d\n", state & 0x1f);
+ av_log(s, AV_LOG_TRACE, "nal %d\n", state & 0x1f);
if ((state & 0x1f) == 7)
extradd = 0;
} while (p < buf_end && (state & 0x1f) != 9 &&