[FFmpeg-cvslog] ffmpeg_vaapi: fix choice of decoder_format

Moritz Barsnick git at videolan.org
Thu Sep 29 02:24:31 EEST 2016


ffmpeg | branch: master | Moritz Barsnick <barsnick at gmx.net> | Tue Sep 27 14:21:49 2016 +0200| [1846a3eac854799fbffc9669dcf4de558b917957] | committer: Michael Niedermayer

ffmpeg_vaapi: fix choice of decoder_format

The check could previously never evaluate to true, probably due to
a typo.

Reported-By: Mihai Chindea <mihai.chindea at uti.eu.com>
Signed-off-by: Moritz Barsnick <barsnick at gmx.net>
Tested-by: Mark Thompson <sw at jkqxz.net>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 ffmpeg_vaapi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg_vaapi.c b/ffmpeg_vaapi.c
index 8090597..f1e7c76 100644
--- a/ffmpeg_vaapi.c
+++ b/ffmpeg_vaapi.c
@@ -302,7 +302,7 @@ static int vaapi_build_decoder_config(VAAPIDecoderContext *ctx,
     if (ctx->output_format != AV_PIX_FMT_NONE &&
         ctx->output_format != AV_PIX_FMT_VAAPI) {
         for (i = 0; constraints->valid_sw_formats[i] != AV_PIX_FMT_NONE; i++) {
-            if (constraints->valid_sw_formats[i] == ctx->decode_format) {
+            if (constraints->valid_sw_formats[i] == ctx->output_format) {
                 ctx->decode_format = ctx->output_format;
                 av_log(ctx, AV_LOG_DEBUG, "Using decode format %s (output "
                        "format).\n", av_get_pix_fmt_name(ctx->decode_format));



More information about the ffmpeg-cvslog mailing list