[MPlayer-cvslog] r31294 - trunk/libmpdemux/demux_lavf.c

[Reimar Döffinger]

On Wed, Jun 02, 2010 at 09:24:03PM +0400, Andrew Savchenko wrote:
> Hello,
> 
> On Monday 31 May 2010, aurel wrote:
> > Author: aurel
> > Date: Mon May 31 21:44:02 2010
> > New Revision: 31294
> > 
> > Log:
> > Switch mkv demuxing to lavf by default.
> 
> This broke playback with -ass for any mkv file with either
> embedded of external ASS subtitles I have, and with both internal
> libass or external one with version 0.9.9. Text shown badly flickers,
> especially on text string replacement.

I think this fixes it:
Index: libmpdemux/demux_lavf.c
===================================================================
--- libmpdemux/demux_lavf.c     (revision 31303)
+++ libmpdemux/demux_lavf.c     (working copy)
@@ -672,8 +672,7 @@
 
     switch (cmd) {
         case DEMUXER_CTRL_CORRECT_PTS:
-            if (!strcmp("matroska", priv->avif->name) ||
-                !strcmp("mpeg",     priv->avif->name) ||
+            if (!strcmp("mpeg",     priv->avif->name) ||
                 !strcmp("mpegts",   priv->avif->name))
                 return DEMUXER_CTRL_NOTIMPL;
            return DEMUXER_CTRL_OK;

Can someone provide one of those PAFF samples that this change would break?
Since nobody else seems to work on investigating and fixing this properly I guess
I'll have to at least have a look at it...