X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fflacdec.c;h=067d4fafe93c8c5b40efdd5f0375b788f09f63a5;hb=d9982edfed1c9285ab0f1104df6c045323433a3b;hp=9db65bdd7d1b7f40a3f5e496f676ded3b35bd6bd;hpb=f48b9304cda7db7ca328f046af48e73931589ff5;p=ffmpeg

diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index 9db65bdd7d1..067d4fafe93 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -50,8 +50,10 @@ static int flac_read_header(AVFormatContext *s,
     }
 
     /* if fLaC marker is not found, assume there is no header */
-    if (get_le32(s->pb) != MKTAG('f','L','a','C'))
+    if (get_le32(s->pb) != MKTAG('f','L','a','C')) {
+        url_fseek(s->pb, -4, SEEK_CUR);
         return 0;
+    }
 
     /* process metadata blocks */
     while (!url_feof(s->pb) && !metadata_last) {
@@ -144,4 +146,5 @@ AVInputFormat flac_demuxer = {
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "flac",
     .value = CODEC_ID_FLAC,
+    .metadata_conv = ff_vorbiscomment_metadata_conv,
 };