git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
10e931d
)
Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 25 Mar 2014 18:24:40 +0000
(19:24 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 25 Mar 2014 18:25:10 +0000
(19:25 +0100)
* commit '
aa499568afc01d59215eef7e5b14b949a9671afc
':
avconv: More descriptive message about framedrop
Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
a5c1026
..
25001f5
100644
(file)
--- a/
ffmpeg.c
+++ b/
ffmpeg.c
@@
-895,7
+895,9
@@
static void do_video_out(AVFormatContext *s,
nb_frames = FFMIN(nb_frames, ost->max_frames - ost->frame_number);
if (nb_frames == 0) {
nb_frames_drop++;
- av_log(NULL, AV_LOG_VERBOSE, "*** drop!\n");
+ av_log(NULL, AV_LOG_WARNING,
+ "*** dropping frame %d from stream %d at ts %"PRId64"\n",
+ ost->frame_number, ost->st->index, in_picture->pts);
return;
} else if (nb_frames > 1) {
if (nb_frames > dts_error_threshold * 30) {