This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:

Subject: edid-decode: search for 'edid-decode (hex)' first
Author:  Hans Verkuil <hverk...@xs4all.nl>
Date:    Fri Feb 21 10:05:53 2025 +0100

For some reason some EDIDs in https://github.com/linuxhw/EDID.git
now start with "EDID (hex):" followed by the same hexdump but with
the "edid-decode (hex)" header.

edid-decode used to search for "EDID (hex):" first, but the parser
gets confused by the second "edid-decode (hex)" block and fails.

Change the order: first try to find "edid-decode (hex)" and use
"EDID (hex):" as the fallback.

Signed-off-by: Hans Verkuil <hverk...@xs4all.nl>

 utils/edid-decode/edid-decode.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

---

http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=5913afda2a66d90bd357bac0d32679e5aabc8d99
diff --git a/utils/edid-decode/edid-decode.cpp 
b/utils/edid-decode/edid-decode.cpp
index 8d611b8f97a7..98be06ea8ddd 100644
--- a/utils/edid-decode/edid-decode.cpp
+++ b/utils/edid-decode/edid-decode.cpp
@@ -1078,9 +1078,9 @@ static bool extract_edid(int fd, FILE *error)
        const char *start;
 
        /* Look for edid-decode output */
-       start = strstr(data, "EDID (hex):");
+       start = strstr(data, "edid-decode (hex):");
        if (!start)
-               start = strstr(data, "edid-decode (hex):");
+               start = strstr(data, "EDID (hex):");
        if (start)
                return extract_edid_hex(strchr(start, ':'));
 

Reply via email to