[FFmpeg-cvslog] hwcontext_vaapi: Fix mapping from DRM

Mark Thompson git at videolan.org
Thu May 24 03:20:43 EEST 2018


ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Thu May 24 01:17:12 2018 +0100| [8ef51a4092a52a9ae2dc42c48d399f4a01312976] | committer: Mark Thompson

hwcontext_vaapi: Fix mapping from DRM

This was broken by bed670a1de29b58fcb3fe046562d8bd125b1457f, which added
an assert that always failed.

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

 libavutil/hwcontext_vaapi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
index e55bb8db3f..a2387d4fc4 100644
--- a/libavutil/hwcontext_vaapi.c
+++ b/libavutil/hwcontext_vaapi.c
@@ -1024,8 +1024,10 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst,
            "%08x.\n", desc->objects[0].fd, va_fourcc);
 
     for (i = 0; i < FF_ARRAY_ELEMS(vaapi_format_map); i++) {
-        if (vaapi_format_map[i].fourcc == va_fourcc)
+        if (vaapi_format_map[i].fourcc == va_fourcc) {
             va_rt_format = vaapi_format_map[i].rt_format;
+            break;
+        }
     }
 
     av_assert0(i < FF_ARRAY_ELEMS(vaapi_format_map));



More information about the ffmpeg-cvslog mailing list