Be more lenient in the 4:2:2 detection.

diff --git a/vaapi_jpeg_decoder.cpp b/vaapi_jpeg_decoder.cpp
index 70b5f374efc51cca1776cd4fbe51205fdb211454..e11c0318b40bde7e8e5a3a726f997a07ab5fb763 100644 (file)
--- a/vaapi_jpeg_decoder.cpp
+++ b/vaapi_jpeg_decoder.cpp
@@ -332,11 +332,10 @@ shared_ptr<Frame> decode_jpeg_vaapi(const string &filename)
                return nullptr;
        }
        if (dinfo.comp_info[0].h_samp_factor != 2 ||
-           dinfo.comp_info[0].v_samp_factor != 2 ||
            dinfo.comp_info[1].h_samp_factor != 1 ||
-           dinfo.comp_info[1].v_samp_factor != 2 ||
+           dinfo.comp_info[1].v_samp_factor != dinfo.comp_info[0].v_samp_factor ||
            dinfo.comp_info[2].h_samp_factor != 1 ||
-           dinfo.comp_info[2].v_samp_factor != 2) {
+           dinfo.comp_info[2].v_samp_factor != dinfo.comp_info[0].v_samp_factor) {
                fprintf(stderr, "Not 4:2:2. (Y=%dx%d, Cb=%dx%d, Cr=%dx%d)\n",
                        dinfo.comp_info[0].h_samp_factor, dinfo.comp_info[0].v_samp_factor,
                        dinfo.comp_info[1].h_samp_factor, dinfo.comp_info[1].v_samp_factor,