From aa9df8940056919ac7c4b65900a2dd43a76321d2 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Date: Thu, 24 Jan 2019 00:22:47 +0100
Subject: [PATCH] lavf/subviewerdec: Skip leading BOM.
Fixes ticket #7661.
---
libavformat/subviewerdec.c | 6 ++++++
1 file changed, 6 insertions(+)
@@ -27,6 +27,7 @@
#include "avformat.h"
#include "internal.h"
#include "subtitles.h"
+#include "avio_internal.h"
#include "libavcodec/internal.h"
#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
@@ -78,6 +79,11 @@ static int subviewer_read_header(AVFormatContext *s)
if (!st)
return AVERROR(ENOMEM);
+ res = ffio_ensure_seekback(s->pb, 3);
+ if (res < 0)
+ return res;
+ if (avio_rb24(s->pb) != MKBETAG(0, 0xef, 0xbb, 0xbf))
+ avio_seek(s->pb, -3, SEEK_CUR);
avpriv_set_pts_info(st, 64, 1, 100);
st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE;
st->codecpar->codec_id = AV_CODEC_ID_SUBVIEWER;
--
1.7.10.4