[FFmpeg-cvslog] avformat/img2dec: Remove dead code from psd_probe()

Michael Niedermayer git at videolan.org
Wed Dec 21 23:47:18 EET 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Dec 21 22:03:55 2016 +0100| [fd1fcb59dcdb0b1644097a69d0c64084bdc26052] | committer: Michael Niedermayer

avformat/img2dec: Remove dead code from psd_probe()

Fixes CID1397124

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd1fcb59dcdb0b1644097a69d0c64084bdc26052
---

 libavformat/img2dec.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index f1a0e7f..c8d7031 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -847,10 +847,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)



More information about the ffmpeg-cvslog mailing list