# HG changeset patch
# User Darren Salt <linux@...>
# Date 1238697803 -3600
# Node ID 95ba273a30a882572d03ceefec74c939877387cf
# Parent 07009944a35cac614da16ead31596eaf34563fb5
Fix up building with libavcodec.so.52 < 52.20.0.
diff -r 95ba273a30a882572d03ceefec74c939877387cf -r 07009944a35cac614da16ead31596eaf34563fb5 src/combined/ffmpeg/ff_video_decoder.c
--- a/src/combined/ffmpeg/ff_video_decoder.c Thu Apr 02 19:43:23 2009 +0100
+++ b/src/combined/ffmpeg/ff_video_decoder.c Sat Mar 28 20:44:44 2009 +0100
@@ -1279,7 +1279,15 @@ static void ff_handle_buffer (ff_video_d
}
/* use externally provided video_step or fall back to stream's time_base otherwise */
- video_step_to_use = (this->video_step || !this->context->time_base.den) ? this->video_step : (int)(90000ll * this->context->ticks_per_frame * this->context->time_base.num / this->context->time_base.den);
+ video_step_to_use = (this->video_step || !this->context->time_base.den)
+ ? this->video_step
+ : (int)(90000ll
+#if LIBAVCODEC_VERSION_INT >= 0x341400
+ * this->context->ticks_per_frame
+#elif LIBAVCODEC_VERSION_INT >= 0x340000
+# warning Building without avcodec ticks_per_frame support; you should upgrade your libavcodec and recompile
+#endif
+ * this->context->time_base.num / this->context->time_base.den);
/* aspect ratio provided by ffmpeg, override previous setting */
if ((this->aspect_ratio_prio < 2) &&
|