From e9817636a7e132129fee0c34e05f224da14c5200 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Thu, 13 Dec 2018 20:12:52 +0100
Subject: avformat/flac_picture: try to guess PNG by actual picture data

Fixes #5028.
---
 libavformat/flac_picture.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'libavformat')

diff --git a/libavformat/flac_picture.c b/libavformat/flac_picture.c
index 38982b9..8317ab2 100644
--- a/libavformat/flac_picture.c
+++ b/libavformat/flac_picture.c
@@ -20,6 +20,8 @@
  */
 
 #include "libavutil/avassert.h"
+#include "libavutil/intreadwrite.h"
+#include "libavcodec/png.h"
 #include "avformat.h"
 #include "flac_picture.h"
 #include "id3v2.h"
@@ -119,6 +121,9 @@ int ff_flac_parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size)
         goto fail;
     }
 
+    if (AV_RB64(data->data) == PNGSIG)
+        id = AV_CODEC_ID_PNG;
+
     st = avformat_new_stream(s, NULL);
     if (!st) {
         RETURN_ERROR(AVERROR(ENOMEM));
-- 
cgit v1.1