[MPlayer-cvslog] r29610 - trunk/libmpdemux/demux_demuxers.c

[Uoti Urpala]

On Tue, 2009-09-01 at 16:51 +0200, reimar wrote:
> Hack demux_demuxers so that demux_demuxers_fill_buffer is actually called.

> Modified: trunk/libmpdemux/demux_demuxers.c
> ==============================================================================
> --- trunk/libmpdemux/demux_demuxers.c	Tue Sep  1 14:12:45 2009	(r29609)
> +++ trunk/libmpdemux/demux_demuxers.c	Tue Sep  1 16:51:49 2009	(r29610)
> @@ -54,6 +54,9 @@ demuxer_t*  new_demuxers_demuxer(demuxer
>    ret->video = vd->video;
>    ret->audio = ad->audio;
>    ret->sub = sd->sub;
> +  if (vd) vd->video->demuxer = ret;

Unfortunately this breaks all the demuxer-specific code in video.c which
now sees the file type as "demux_demuxers type".

What was your motivation for this change? To enable r29611? If so then
rather than changing video.c that subtitle problem is probably better
fixed otherwise. I think 29611 is not a correct fix anyway - it only
ensures there's one demuxed packet, but sometimes more than one would be
needed.