forked from bartvdbraak/blender
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.
This commit is contained in:
parent
37bc3850ce
commit
8ca9fa5fd3
@ -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
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user