Browse Source

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix build with disabled avfilter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.1
Michael Niedermayer 12 years ago
parent
commit
9042c8a4db
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      ffplay.c

+ 4
- 0
ffplay.c View File

@@ -2175,7 +2175,11 @@ static int audio_decode_frame(VideoState *is)
else if (is->frame->pkt_pts != AV_NOPTS_VALUE) else if (is->frame->pkt_pts != AV_NOPTS_VALUE)
is->frame->pts = av_rescale_q(is->frame->pkt_pts, is->audio_st->time_base, tb); is->frame->pts = av_rescale_q(is->frame->pkt_pts, is->audio_st->time_base, tb);
else if (is->audio_frame_next_pts != AV_NOPTS_VALUE) else if (is->audio_frame_next_pts != AV_NOPTS_VALUE)
#if CONFIG_AVFILTER
is->frame->pts = av_rescale_q(is->audio_frame_next_pts, (AVRational){1, is->audio_filter_src.freq}, tb); is->frame->pts = av_rescale_q(is->audio_frame_next_pts, (AVRational){1, is->audio_filter_src.freq}, tb);
#else
is->frame->pts = av_rescale_q(is->audio_frame_next_pts, (AVRational){1, is->audio_src.freq}, tb);
#endif


if (is->frame->pts != AV_NOPTS_VALUE) if (is->frame->pts != AV_NOPTS_VALUE)
is->audio_frame_next_pts = is->frame->pts + is->frame->nb_samples; is->audio_frame_next_pts = is->frame->pts + is->frame->nb_samples;


Loading…
Cancel
Save