OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
97b925e
)
In ffplay:get_video_frame(), use frame->pkt_pts rather than reordered_opaque.
author
Stefano Sabatini
<stefano.sabatini-lala@poste.it>
Sun, 16 Jan 2011 17:39:34 +0000
(18:39 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 31 Jan 2011 17:25:45 +0000
(18:25 +0100)
AVCodecContext.reordered_opaque is deprecated for this specific use.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
2855080447a226aba7e88e943fd8a8779d6daa98
)
ffplay.c
patch
|
blob
|
history
diff --git
a/ffplay.c
b/ffplay.c
index
edc6097
..
1df3824
100644
(file)
--- 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;
}