summaryrefslogtreecommitdiff
path: root/ffplay.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-21 18:03:21 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-21 18:03:27 +0200
commit9042c8a4db9bde455ee50bb27f84f0dfadae8315 (patch)
tree21f39b058f955087437bea513c141dd23f67c27a /ffplay.c
parent118a1c2f4c2385f629a7be8479cbb20eaf391cac (diff)
parentb198e33ad8b3e2f11d525cd6bcd211d6298ba81c (diff)
Merge remote-tracking branch 'cus/stable'
* cus/stable: ffplay: fix build with disabled avfilter Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ffplay.c b/ffplay.c
index 9b5dce0add..ca95c2c7bc 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2175,7 +2175,11 @@ static int audio_decode_frame(VideoState *is)
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);
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);
+#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)
is->audio_frame_next_pts = is->frame->pts + is->frame->nb_samples;