diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ffmpeg/ffmpeg_compat.h | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index 3f168894cd9..6fefa164dc3 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -113,25 +113,28 @@ void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp) } FFMPEG_INLINE -int64_t av_get_pts_from_frame(AVFormatContext *avctx, AVFrame *picture) +int64_t timestamp_from_pts_or_dts(int64_t pts, int64_t dts) { - int64_t pts; - pts = picture->pts; - - if (pts == AV_NOPTS_VALUE) { - pts = picture->pkt_dts; - } + /* Some videos do not have any pts values, use dts instead in those cases if + * possible. Usually when this happens dts can act as pts because as all frames + * should then be presented in their decoded in order. IE pts == dts. */ if (pts == AV_NOPTS_VALUE) { - pts = 0; + return dts; } - - (void)avctx; return pts; } -/* --- Deinterlace code block begin --- */ +FFMPEG_INLINE +int64_t av_get_pts_from_frame(AVFrame *picture) +{ + return timestamp_from_pts_or_dts(picture->pts, picture->pkt_dts); +} -/* NOTE: The code in this block are from FFmpeg 2.6.4, which is licensed by LGPL. */ +/* -------------------------------------------------------------------- */ +/** \name Deinterlace code block + * + * NOTE: The code in this block are from FFmpeg 2.6.4, which is licensed by LGPL. + * \{ */ #define MAX_NEG_CROP 1024 |