[FFmpeg-cvslog] vaapi_h264: fix RefPicList[] field flags.

Gwenole Beauchesne git at videolan.org
Tue Jun 23 13:53:23 CEST 2015


ffmpeg | branch: release/2.7 | Gwenole Beauchesne <gwenole.beauchesne at intel.com> | Tue Jun 23 11:35:45 2015 +0200| [071d7f4e179a18a403063c57f92664e8079def09] | committer: Gwenole Beauchesne

vaapi_h264: fix RefPicList[] field flags.

Use new H264Ref.reference field to track field picture flags. The
H264Picture.reference flag in DPB is now irrelevant here.

This is a regression from git commit d8151a7, and that affected
multiple interlaced video streams.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne at intel.com>
(cherry picked from commit 88325c2e0b63abf4c3482cecd43870015123764a)

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

 libavcodec/vaapi_h264.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
index eef3c29..151aca9 100644
--- a/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@ -162,7 +162,8 @@ static void fill_vaapi_RefPicList(VAPictureH264 RefPicList[32],
     unsigned int i, n = 0;
     for (i = 0; i < ref_count; i++)
         if (ref_list[i].reference)
-            fill_vaapi_pic(&RefPicList[n++], ref_list[i].parent, 0);
+            fill_vaapi_pic(&RefPicList[n++], ref_list[i].parent,
+                           ref_list[i].reference);
 
     for (; n < 32; n++)
         init_vaapi_pic(&RefPicList[n]);



More information about the ffmpeg-cvslog mailing list