[MPlayer-cvslog] r27489 - in trunk: command.c libmpcodecs/vd_ffmpeg.c libmpdemux/video.c

[Reimar Döffinger]

On Wed, Aug 27, 2008 at 01:31:53PM +0200, aurel wrote:
> Author: aurel
> Date: Wed Aug 27 13:31:53 2008
> New Revision: 27489
> 
> Log:
> handle the lavfpref demuxer in the same way as the lavf one
> 
> Modified:
>    trunk/command.c
>    trunk/libmpcodecs/vd_ffmpeg.c
>    trunk/libmpdemux/video.c
> 
> Modified: trunk/command.c
> ==============================================================================
> --- trunk/command.c	(original)
> +++ trunk/command.c	Wed Aug 27 13:31:53 2008
> @@ -1356,6 +1356,7 @@ static int mp_property_sub(m_option_t * 
>  
>  	if ((mpctx->demuxer->type == DEMUXER_TYPE_MATROSKA
>               || mpctx->demuxer->type == DEMUXER_TYPE_LAVF
> +             || mpctx->demuxer->type == DEMUXER_TYPE_LAVF_PREFERRED
>               || mpctx->demuxer->type == DEMUXER_TYPE_OGG)
>               && d_sub && d_sub->sh && dvdsub_id >= 0) {
>              const char* lang = ((sh_sub_t*)d_sub->sh)->lang;

Thanks to a merge conflict I just noticed I do not have those demuxer
type checks anymore. What is the point in them? Just to avoid
having "unknown" written there for demuxers that never set a language?
Seems overkill to keep such ugly code because of that...