FFmpegImage: Find known input directly

Author: fritsch

xbmc/guilib/FFmpegImage.cpp

@@ -167,25 +167,19 @@ bool CFFmpegImage::LoadImageFromMemory(unsigned char* buffer, unsigned int bufSi
   fctx->pb = ioctx;
   ioctx->max_packet_size = FFMPEG_FILE_BUFFER_SIZE;
 
-  AVProbeData pdata;
-  pdata.buf = buffer;
-  pdata.buf_size = bufSize;
-  pdata.filename = "";
-  pdata.mime_type = m_strMimeType.c_str();
-
-  int score = 0;
-  AVInputFormat* inp = av_probe_input_format3(&pdata, 1, &score);
-
-  if (!inp)
-  {
-    if (m_strMimeType == "image/jpeg" || m_strMimeType == "image/jpg")
-      inp = av_find_input_format("mjpeg");
-    else
-      CLog::Log(LOGNOTICE, "Could not determine format of: %s", m_strMimeType.c_str());
-  }
+  AVInputFormat* inp = nullptr;
+  if (m_strMimeType == "image/jpeg" || m_strMimeType == "image/jpg")
+    inp = av_find_input_format("jpeg_pipe");
+  else if (m_strMimeType == "image/png")
+    inp = av_find_input_format("png_pipe");
+  else if (m_strMimeType == "image/tiff")
+    inp = av_find_input_format("tiff_pipe");
+  else if (m_strMimeType == "image/webp")
+    inp = av_find_input_format("webp_pipe");
 
   if (avformat_open_input(&fctx, "", inp, NULL) < 0)
   {
+    CLog::Log(LOGNOTICE, "Could not find suitable input format: %s", m_strMimeType.c_str());
     avformat_close_input(&fctx);
     FreeIOCtx(ioctx);
     return false;