[Bf-blender-cvs] [9c587ae] master: Fix wrong animation duration when using older Libav

[Sergey Sharybin]

Commit: 9c587ae8a053dd888c60d57080b3fdb0ce87e3f0
Author: Sergey Sharybin
Date:   Thu Feb 6 15:57:32 2014 +0600
https://developer.blender.org/rB9c587ae8a053dd888c60d57080b3fdb0ce87e3f0

Fix wrong animation duration when using older Libav

===================================================================

M	intern/ffmpeg/ffmpeg_compat.h

===================================================================

diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
index 801ab6e..ff2cc40 100644
--- a/intern/ffmpeg/ffmpeg_compat.h
+++ b/intern/ffmpeg/ffmpeg_compat.h
@@ -426,7 +426,12 @@ AVRational av_get_r_frame_rate_compat(const AVStream *stream)
 #if LIBAVCODEC_VERSION_MICRO >= 100
 	return stream->r_frame_rate;
 #else
+#  if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 23, 1)
+	/* For until r_frame_rate was deprecated use it. */
+	return stream->r_frame_rate;
+#  else
 	return stream->avg_frame_rate;
+#  endif
 #endif
 }