avformat/hlsenc: set default http method to PUT when method is null

[ffmpeg] / libavformat / img2dec.c

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index f1a0e7fa54694f2cfbe76862a1d50e24abfe6720..c3c2cf3640bb69d4892523302c9675a8c8a0ec87 100644 (file)
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -755,6 +755,8 @@ static int jpeg_probe(AVProbeData *p)
 
     if (state == EOI)
         return AVPROBE_SCORE_EXTENSION + 1;
+    if (state == SOS)
+        return AVPROBE_SCORE_EXTENSION / 2;
     return AVPROBE_SCORE_EXTENSION / 8;
 }
 
@@ -847,10 +849,7 @@ static int psd_probe(AVProbeData *p)
     if ((color_mode <= 9) && (color_mode != 5) && (color_mode != 6))
         ret += 1;
 
-    if (ret)
-        return AVPROBE_SCORE_EXTENSION + ret;
-
-    return 0;
+    return AVPROBE_SCORE_EXTENSION + ret;
 }
 
 static int sgi_probe(AVProbeData *p)