History

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

Michael Niedermayer committed 11 years ago

Commit 40d552d2 parents 8e8219e 1a3eb0439 files · +360 −360Browse files

Showing the changes to libavdevice (2 of 39 files). Show all

Unified · Split

2 files
  1. libavdevice/dv1394.c +2 −2
  2. libavdevice/fbdev_dec.c +1 −1
libavdevice/dv1394.c+2−2
@@ -160,7 +160,7 @@ restart_poll: · 159 unmodified lines
160160 av_log(context, AV_LOG_ERROR, "Failed to get status: %s\n", strerror(errno));
161161 return AVERROR(EIO);
162162 }
163− av_dlog(context, "DV1394: status\n"
163+ av_log(context, AV_LOG_TRACE, "DV1394: status\n"
164164 "\tactive_frame\t%d\n"
165165 "\tfirst_clear_frame\t%d\n"
166166 "\tn_clear_frames\t%d\n"
@@ -181,7 +181,7 @@ restart_poll: · 14 unmodified lines
181181 }
182182 }
183183
184− av_dlog(context, "index %d, avail %d, done %d\n", dv->index, dv->avail,
184+ av_log(context, AV_LOG_TRACE, "index %d, avail %d, done %d\n", dv->index, dv->avail,
185185 dv->done);
186186
187187 size = avpriv_dv_produce_packet(dv->dv_demux, pkt,
libavdevice/fbdev_dec.c+1−1
@@ -163,7 +163,7 @@ static int fbdev_read_packet(AVFormatContext *avctx, AVPacket *pkt) · 162 unmodified lines
163163 while (1) {
164164 curtime = av_gettime();
165165 delay = fbdev->time_frame - curtime;
166− av_dlog(avctx,
166+ av_log(avctx, AV_LOG_TRACE,
167167 "time_frame:%"PRId64" curtime:%"PRId64" delay:%"PRId64"\n",
168168 fbdev->time_frame, curtime, delay);
169169 if (delay <= 0) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t