diff options
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 } |