Revert "Don't even reference image/jpeg"

This reverts commit 1ae78235.

jpeg2/jpeg_picker.go

@@ -2,17 +2,35 @@ package jpeg2
 
 import (
 	"image"
+	gojpeg "image/jpeg"
 	"io"
 
+	"github.com/turt2live/matrix-media-repo/util/readers"
 	libjpeg "github.com/viam-labs/go-libjpeg/jpeg"
 )
 
 func Decode(r io.Reader) (image.Image, error) {
-	return libjpeg.Decode(r, &libjpeg.DecoderOptions{})
+	br := readers.NewBufferReadsReader(r)
+	c, err := libjpeg.Decode(r, &libjpeg.DecoderOptions{})
+	if err != nil {
+		r = br.GetRewoundReader()
+		return gojpeg.Decode(r)
+	} else {
+		br.Discard()
+	}
+	return c, nil
 }
 
 func DecodeConfig(r io.Reader) (image.Config, error) {
-	return libjpeg.DecodeConfig(r)
+	br := readers.NewBufferReadsReader(r)
+	c, err := libjpeg.DecodeConfig(r)
+	if err != nil {
+		r = br.GetRewoundReader()
+		return gojpeg.DecodeConfig(r)
+	} else {
+		br.Discard()
+	}
+	return c, nil
 }
 
 func init() {