[FFmpeg-devel] [PATCH] avformat/mpl2dec: skip BOM when probing

[Paul B Mahol]

On 2/15/17, wm4 <nfxjfg at googlemail.com> wrote:
> On Sat, 11 Feb 2017 11:56:07 +0100
> Paul B Mahol <onemda at gmail.com> wrote:
>
>> Signed-off-by: Paul B Mahol <onemda at gmail.com>
>> ---
>>  libavformat/mpl2dec.c | 8 ++++++++
>>  1 file changed, 8 insertions(+)
>>
>> diff --git a/libavformat/mpl2dec.c b/libavformat/mpl2dec.c
>> index 59589d5..0e30cb0 100644
>> --- a/libavformat/mpl2dec.c
>> +++ b/libavformat/mpl2dec.c
>> @@ -23,6 +23,8 @@
>>   * MPL2 subtitles format demuxer
>>   */
>>
>> +#include "libavutil/intreadwrite.h"
>> +
>>  #include "avformat.h"
>>  #include "internal.h"
>>  #include "subtitles.h"
>> @@ -39,6 +41,9 @@ static int mpl2_probe(AVProbeData *p)
>>      const unsigned char *ptr = p->buf;
>>      const unsigned char *ptr_end = ptr + p->buf_size;
>>
>> +    if (AV_RB24(ptr) == 0xefbbbf)
>> +        ptr += 3;
>> +
>>      for (i = 0; i < 2; i++) {
>>          if (sscanf(ptr, "[%"SCNd64"][%"SCNd64"]%c", &start, &end, &c) !=
>> 3 &&
>>              sscanf(ptr, "[%"SCNd64"][]%c",          &start,       &c) !=
>> 2)
>> @@ -94,6 +99,9 @@ static int mpl2_read_header(AVFormatContext *s)
>>          if (!len)
>>              break;
>>
>> +        if (AV_RB24(p) == 0xefbbbf)
>> +            p += 3;
>> +
>>          line[strcspn(line, "\r\n")] = 0;
>>
>>          if (!read_ts(&p, &pts_start, &duration)) {
>
> What happened to the equivalent patch I sent almost a year ago? My
> patch skipped it only in the probe function, because the subtitle line
> reader skips BOM already.

It doesn't appear that is true.

>
> It referenced the same trac ticket.

You needd to resend/ping patch more often.