[SCM] libav/experimental: In ffplay:get_video_frame(), use frame->pkt_pts rather than reordered_opaque.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:22:58 UTC 2013


The following commit has been merged in the experimental branch:
commit 2855080447a226aba7e88e943fd8a8779d6daa98
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Sun Jan 16 18:39:34 2011 +0100

    In ffplay:get_video_frame(), use frame->pkt_pts rather than reordered_opaque.
    
    AVCodecContext.reordered_opaque is deprecated for this specific use.
    
    Signed-off-by: Mans Rullgard <mans at mansr.com>

diff --git a/ffplay.c b/ffplay.c
index edc6097..1df3824 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1570,16 +1570,15 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke
         return 0;
     }
 
-    is->video_st->codec->reordered_opaque = pkt->pts;
     len1 = avcodec_decode_video2(is->video_st->codec,
                                  frame, &got_picture,
                                  pkt);
 
     if (got_picture) {
         if (decoder_reorder_pts == -1) {
-            *pts = guess_correct_pts(&is->pts_ctx, frame->reordered_opaque, pkt->dts);
+            *pts = guess_correct_pts(&is->pts_ctx, frame->pkt_pts, pkt->dts);
         } else if (decoder_reorder_pts) {
-            *pts = frame->reordered_opaque;
+            *pts = frame->pkt_pts;
         } else {
             *pts = pkt->dts;
         }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list