Commit 41e7e46c authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'aa499568'

* commit 'aa499568':
  avconv: More descriptive message about framedrop
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 10e931d5 aa499568
......@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment