diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-05-12 17:43:36 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-05-12 17:43:36 +0300 |
| commit | 8ca9fa5fd367de6930cf5ee40b099f2d37007116 (patch) | |
| tree | 11c8ab6199125e8004c89e645dccd739897c92f8 /intern/ffmpeg | |
| parent | 37bc3850cee29b10f4b5a4ff76e663c95b31f1dc (diff) | |
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.
Diffstat (limited to 'intern/ffmpeg')
| -rw-r--r-- | intern/ffmpeg/ffmpeg_compat.h | 9 |
1 files changed, 2 insertions, 7 deletions
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 } |