← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to mpcommon.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
mpcommon.c
40
40
#include "cpudetect.h"
41
41
#include "help_mp.h"
42
42
#include "mp_msg.h"
 
43
#include "parser-cfg.h"
43
44
#include "sub/spudec.h"
44
45
#include "version.h"
 
46
#include "sub/ass_mp.h"
45
47
#include "sub/vobsub.h"
46
48
#include "sub/av_sub.h"
47
49
#include "libmpcodecs/dec_teletext.h"
52
54
double sub_last_pts = -303;
53
55
 
54
56
#ifdef CONFIG_ASS
55
 
#include "sub/ass_mp.h"
56
57
ASS_Track* ass_track = 0; // current track to render
57
58
#endif
58
59
 
77
78
           gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
78
79
           gCpuCaps.hasSSE, gCpuCaps.hasSSE2, gCpuCaps.hasSSSE3);
79
80
#if CONFIG_RUNTIME_CPUDETECT
80
 
    mp_msg(MSGT_CPLAYER,MSGL_V, MSGTR_CompiledWithRuntimeDetection);
 
81
    mp_msg(MSGT_CPLAYER, MSGL_V, "Compiled with runtime CPU detection.\n");
81
82
#else
82
 
    mp_msg(MSGT_CPLAYER,MSGL_V, MSGTR_CompiledWithCPUExtensions);
 
83
    mp_msg(MSGT_CPLAYER, MSGL_V, "Compiled for x86 CPU with extensions:");
83
84
if (HAVE_MMX)
84
85
    mp_msg(MSGT_CPLAYER,MSGL_V," MMX");
85
86
if (HAVE_MMX2)
407
408
#endif /* CONFIG_GUI */
408
409
}
409
410
 
 
411
m_config_t *mconfig;
 
412
 
 
413
int cfg_inc_verbose(m_option_t *conf)
 
414
{
 
415
    ++verbose;
 
416
    return 0;
 
417
}
 
418
 
 
419
int cfg_include(m_option_t *conf, const char *filename)
 
420
{
 
421
    return m_config_parse_config_file(mconfig, filename, 0);
 
422
}
 
423
 
410
424
const m_option_t noconfig_opts[] = {
411
425
    {"all", noconfig_all, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL},
412
426
    {"system", &disable_system_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL},
478
492
                    free(conf_path);
479
493
                    return 0;
480
494
                }
481
 
                mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_BuiltinCodecsConf);
 
495
                mp_msg(MSGT_CPLAYER, MSGL_V, "Using built-in default codecs.conf.\n");
482
496
            }
483
497
        }
484
498
        free(conf_path);