Revert 229729 "Merge 228354 "Better handle SOS CSi values and or..."

third_party/libjpeg/google.jdmarker.patch

Index: third_party/libjpeg/google.jdmarker.patch
===================================================================
--- third_party/libjpeg/google.jdmarker.patch	(revision 229746)
+++ third_party/libjpeg/google.jdmarker.patch	(working copy)
@@ -1,17 +0,0 @@
-diff --git a/third_party/libjpeg/jdmarker.c b/third_party/libjpeg/jdmarker.c
-index f4cca8c..c9325af 100644
---- a/third_party/libjpeg/jdmarker.c
-+++ b/third_party/libjpeg/jdmarker.c
-@@ -342,6 +342,12 @@ get_sos (j_decompress_ptr cinfo)
-     
-     TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
- 	     compptr->dc_tbl_no, compptr->ac_tbl_no);
-+
-+    /* This CSi (cc) should differ from the previous CSi */
-+    for (ci = 0; ci < i; ci++) {
-+      if (cinfo->cur_comp_info[ci] == compptr)
-+        ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
-+    }
-   }
- 
-   /* Collect the additional scan parameters Ss, Se, Ah/Al. */