[FFmpeg-cvslog] avcodec/crystalhd: Explicitly set frame pts at all times

Philip Langdale git at videolan.org
Mon Apr 24 01:38:59 EEST 2017


ffmpeg | branch: master | Philip Langdale <philipl at overt.org> | Sun Apr 23 14:34:03 2017 -0700| [181aa1be493416c38c8adf0ce21e7fdac64a039e] | committer: Philip Langdale

avcodec/crystalhd: Explicitly set frame pts at all times

Previously, the pts value was initialised to AV_NOPTS_VALUE and so
it was not necessary to always set it. Now, with the new-new decode
API, this is no longer true. I'm not sure why I avoided setting the
pts when the decoder value was also AV_NOPTS_VALUE - it clearly
wouldn't have changed anything previously, but here we are.

Failing to do this, means the frame pts will be some random uninitalised
value.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=181aa1be493416c38c8adf0ce21e7fdac64a039e
---

 libavcodec/crystalhd.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c
index 8956ca4bfb..a22dfe16ea 100644
--- a/libavcodec/crystalhd.c
+++ b/libavcodec/crystalhd.c
@@ -537,14 +537,13 @@ static inline CopyRet copy_frame(AVCodecContext *avctx,
     if (interlaced)
         frame->top_field_first = !bottom_first;
 
-    if (pkt_pts != AV_NOPTS_VALUE) {
-        frame->pts = pkt_pts;
+    frame->pts = pkt_pts;
 #if FF_API_PKT_PTS
 FF_DISABLE_DEPRECATION_WARNINGS
-        frame->pkt_pts = pkt_pts;
+    frame->pkt_pts = pkt_pts;
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif
-    }
+
     frame->pkt_pos = -1;
     frame->pkt_duration = 0;
     frame->pkt_size = -1;



More information about the ffmpeg-cvslog mailing list