diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-21 18:03:21 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-21 18:03:27 +0200 |
commit | 9042c8a4db9bde455ee50bb27f84f0dfadae8315 (patch) | |
tree | 21f39b058f955087437bea513c141dd23f67c27a | |
parent | 118a1c2f4c2385f629a7be8479cbb20eaf391cac (diff) | |
parent | b198e33ad8b3e2f11d525cd6bcd211d6298ba81c (diff) | |
download | ffmpeg-9042c8a4db9bde455ee50bb27f84f0dfadae8315.tar.gz |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: fix build with disabled avfilter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | ffplay.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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; |