Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-02-06 13:57:32 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-02-06 13:57:32 +0400
commit9c587ae8a053dd888c60d57080b3fdb0ce87e3f0 (patch)
treed075916c1046f60cb45fc844bb2a950b47f1aecc /intern/ffmpeg/ffmpeg_compat.h
parent4f40f8780d93718a539c0676ca3989e1e4406d37 (diff)
Fix wrong animation duration when using older Libav
Diffstat (limited to 'intern/ffmpeg/ffmpeg_compat.h')
-rw-r--r--intern/ffmpeg/ffmpeg_compat.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
index 801ab6e659d..ff2cc405f4c 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
}