comparison mplayer.c @ 34494:fede902a408c

Fix per-file ASS options like -ass-force-style. Previously the per-file settings were (sometimes at least) completely ignored and only the global ones used.

34493:da31318562d9

        mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx);

        // setup global sub numbering
        mpctx->sub_counts[SUB_SOURCE_VOBSUB] = vobsub_get_indexes_count(vo_vobsub);
    }

//============ Open & Sync STREAM --- fork cache2 ====================

    mpctx->stream  = NULL;
    mpctx->demuxer = NULL;

34494:fede902a408c

        mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx);

        // setup global sub numbering
        mpctx->sub_counts[SUB_SOURCE_VOBSUB] = vobsub_get_indexes_count(vo_vobsub);
    }
#ifdef CONFIG_ASS
    // must be before demuxer open, since the settings are
    // used in generating the ASSTrack
    if (ass_enabled && ass_library)
        ass_mp_reset_config(ass_library);
#endif

//============ Open & Sync STREAM --- fork cache2 ====================

    mpctx->stream  = NULL;
    mpctx->demuxer = NULL;