[libav-commits] vaapi_encode: Fix fallback when input does not match any format

Mark Thompson git at libav.org
Tue Jun 21 22:34:46 CEST 2016


Module: libav
Branch: master
Commit: 11b8030309ee93d79b3a6cd4b83bf00757db1598

Author:    Mark Thompson <sw at jkqxz.net>
Committer: Mark Thompson <sw at jkqxz.net>
Date:      Sat Jun 18 13:05:23 2016 +0100

vaapi_encode: Fix fallback when input does not match any format

Just a typo.  Add a comment to make it clearer what it's doing.

---

 libavcodec/vaapi_encode.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
index 45f5e57..c3f4e44 100644
--- a/libavcodec/vaapi_encode.c
+++ b/libavcodec/vaapi_encode.c
@@ -1114,8 +1114,11 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx,
                 break;
             }
         }
-        if (recon_format == AV_PIX_FMT_NONE)
-            recon_format = constraints->valid_sw_formats[i];
+        if (recon_format == AV_PIX_FMT_NONE) {
+            // No match.  Just use the first in the supported list and
+            // hope for the best.
+            recon_format = constraints->valid_sw_formats[0];
+        }
     } else {
         // No idea what to use; copy input format.
         recon_format = ctx->input_frames->sw_format;



More information about the libav-commits mailing list