Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T51153: Video duration is detected wrong after FFmpeg update

Browse Source 
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.
This commit is contained in:
Sergey Sharybin
2017-05-12 16:43:36 +02:00
parent 37bc3850ce
commit 8ca9fa5fd3
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
intern/ffmpeg/ffmpeg_compat.h
View File

@@ -430,16 +430,11 @@ void av_frame_free(AVFrame **frame)
FFMPEG_INLINE FFMPEG_INLINE
AVRational av_get_r_frame_rate_compat(const AVStream *stream) AVRational av_get_r_frame_rate_compat(const AVStream *stream)
{ {
/* Stupid way to distinguish FFmpeg from Libav. */ #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 23, 1)
#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. */ /* For until r_frame_rate was deprecated use it. */
return stream->r_frame_rate; return stream->r_frame_rate;
# else #else
return stream->avg_frame_rate; return stream->avg_frame_rate;
# endif
#endif #endif
} }