[Bf-blender-cvs] [8ca9fa5fd36] master: Fix T51153: Video duration is detected wrong after FFmpeg update

[Sergey Sharybin]

Commit: 8ca9fa5fd367de6930cf5ee40b099f2d37007116
Author: Sergey Sharybin
Date:   Fri May 12 16:43:36 2017 +0200
Branches: master
https://developer.blender.org/rB8ca9fa5fd367de6930cf5ee40b099f2d37007116

Fix T51153: Video duration is detected wrong after FFmpeg update

The issue was caused by stupid workaorund for libav. Now things works for
FFmpeg. There might need some tweaks needed for Libav, but that one is
not really priority for support.

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

M	intern/ffmpeg/ffmpeg_compat.h

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

diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
index d6220ebf562..9c06c8a6d67 100644
--- a/intern/ffmpeg/ffmpeg_compat.h
+++ b/intern/ffmpeg/ffmpeg_compat.h
@@ -430,16 +430,11 @@ void av_frame_free(AVFrame **frame)
 FFMPEG_INLINE
 AVRational av_get_r_frame_rate_compat(const AVStream *stream)
 {
-	/* Stupid way to distinguish FFmpeg from Libav. */
-#if LIBAVCODEC_VERSION_MICRO >= 100
-	return stream->r_frame_rate;
-#else
-#  if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 23, 1)
+#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
+#else
 	return stream->avg_frame_rate;
-#  endif
 #endif
 }