[MPlayer-dev-eng] [PATCH] Handle AV_CODEC_ID_SUBRIP subtitles

[Reimar Döffinger]

On Fri, Aug 24, 2012 at 08:17:42PM -0700, Philip Langdale wrote:
> On Sun, 19 Aug 2012 21:39:23 +0200
> Reimar Döffinger <Reimar.Doeffinger at gmx.de> wrote:
> 
> > 
> > > @@ -812,7 +814,9 @@
> > >                              prog->aid = program->stream_index[i];
> > >                          break;
> > >                      case AVMEDIA_TYPE_SUBTITLE:
> > > -                        if(prog->sid == -2 &&
> > > priv->avfc->streams[program->stream_index[i]]->codec->codec_id ==
> > > CODEC_ID_TEXT)
> > > +                        if(prog->sid == -2 &&
> > > +
> > > (priv->avfc->streams[program->stream_index[i]]->codec->codec_id ==
> > > CODEC_ID_TEXT ||
> > > +
> > > priv->avfc->streams[program->stream_index[i]]->codec->codec_id ==
> > > AV_CODEC_ID_SUBRIP))
> > 
> > I guess it's fine, though I am tempted to just remove that condition
> > completely.
> 
> I've updated the diff as requested. I've left this second part in.
> Until you do remove it, we should ensure the functionality is identical
> with the new codec id.

Removed that code and applied the other part.