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

[Guillaume POIRIER]

Hello,

On Tue, Sep 9, 2008 at 4:45 PM, uau <subversion at mplayerhq.hu> wrote:
> Author: uau
> Date: Tue Sep  9 16:45:50 2008
> New Revision: 27556
>
> Log:
> Make internal Matroska demuxer default again
>
> Undo Aurelien's previous commit which made the lavf demuxer the
> default. SSA/ASS subtitles do not work properly with the lavf demuxer
> at the moment. That's much more important than any issues with the
> internal demuxer. The internal demuxer must remain the default at least
> until the subtitle issues are resolved.
>
> Modified:
>   trunk/libmpdemux/demux_lavf.c
>
> Modified: trunk/libmpdemux/demux_lavf.c
> ==============================================================================
> --- trunk/libmpdemux/demux_lavf.c       (original)
> +++ trunk/libmpdemux/demux_lavf.c       Tue Sep  9 16:45:50 2008
> @@ -183,7 +183,6 @@ static const char *preferred_list[] = {
>     "mov,mp4,m4a,3gp,3g2,mj2",
>     "mpc",
>     "mpc8",
> -    "matroska",
>     NULL
>  };


O-oh. Looks like MPlayer has gone into a commit war. Attila, Diego,
could you take the appropriate measure?

Guillaume
-- 
One should not give up hope on imbeciles. With a little training, you
can make them into soldiers.
 -- Pierre Desproges