summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-02-10 16:44:52 +0000
committerjstebbins <[email protected]>2014-02-10 16:44:52 +0000
commite22ffd488a656f6534ce93f85dcfdb8fdb7976bd (patch)
tree445050d47fbe6af505cf0d7937a5df6ac705738c /contrib/ffmpeg
parent5a2ff677bf3082ac2b4ca49d595a3eb093dd14e9 (diff)
libav: patch AVFrame pkt_pts problem to fix fraps decoder
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6022 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg')
-rw-r--r--contrib/ffmpeg/A03-reget-buffer-pkt-pts.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/contrib/ffmpeg/A03-reget-buffer-pkt-pts.patch b/contrib/ffmpeg/A03-reget-buffer-pkt-pts.patch
new file mode 100644
index 000000000..c64c39e40
--- /dev/null
+++ b/contrib/ffmpeg/A03-reget-buffer-pkt-pts.patch
@@ -0,0 +1,30 @@
+From 091f3393401f7eb83fef4fb9cbb2e5ed2837b623 Mon Sep 17 00:00:00 2001
+From: John Stebbins <[email protected]>
+Date: Mon, 10 Feb 2014 08:52:07 -0700
+Subject: [PATCH] lavc: set AVFrame pkt_pts and reordered_opaque in
+ reget_buffer
+
+---
+ libavcodec/utils.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libavcodec/utils.c b/libavcodec/utils.c
+index 46f339f..b2b11ef 100644
+--- a/libavcodec/utils.c
++++ b/libavcodec/utils.c
+@@ -762,8 +762,11 @@ int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame)
+ if (!frame->data[0])
+ return ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF);
+
+- if (av_frame_is_writable(frame))
++ if (av_frame_is_writable(frame)) {
++ frame->pkt_pts = avctx->internal->pkt ? avctx->internal->pkt->pts : AV_NOPTS_VALUE;
++ frame->reordered_opaque = avctx->reordered_opaque;
+ return 0;
++ }
+
+ av_frame_move_ref(&tmp, frame);
+
+--
+1.8.5.3
+