August 2009 - MPlayer-cvslog - lists.mplayerhq.hu

r23524 - trunk/etc/codecs.conf
by compn 10 Jun '10

10 Jun '10

Author: compn Date: Sat Jun 9 00:59:04 2007 New Revision: 23524 Log: add mmes fourcc for mpeg2 in avi files Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Sat Jun 9 00:59:04 2007 @@ -58,6 +58,7 @@ videocodec mpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV @@ -85,6 +86,7 @@ videocodec ffmpeg2 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -104,6 +106,7 @@ videocodec ffmpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV @@ -122,6 +125,7 @@ videocodec ffmpeg12mc fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" out IDCT_MPEG2

4 5

r28039 - trunk/etc/codecs.conf
by diego 04 Sep '09

04 Sep '09

Author: diego Date: Wed Nov 26 14:04:10 2008 New Revision: 28039 Log: Update Tremor comment regarding fixed-point mode. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Wed Nov 26 14:04:10 2008 @@ -3494,7 +3494,7 @@ audiocodec vorbis audiocodec tremor info "OggVorbis audio decoder" status working - comment "OggVorbis fixed-point decoder useful for ARM based systems" + comment "fixed-point decoder useful systems without floating-point unit" fourcc vrbs format 0x566F driver tremor

4 3

r29604 - trunk/mplayer.c
by reimar 31 Aug '09

31 Aug '09

Author: reimar Date: Mon Aug 31 12:07:44 2009 New Revision: 29604 Log: Fix per-file config file loading for DOS paths (i.e. where \ and : can also separate path and file name). Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Mon Aug 31 11:48:25 2009 (r29603) +++ trunk/mplayer.c Mon Aug 31 12:07:44 2009 (r29604) @@ -938,7 +938,16 @@ static void load_per_file_config (m_conf if (use_filedir_conf && try_load_config(conf, cfg)) return; - if ((name = strrchr (cfg, '/')) == NULL) + name = strrchr(cfg, '/'); + if (HAVE_DOS_PATHS) { + char *tmp = strrchr(cfg, '\\'); + if (!name || tmp > name) + name = tmp; + tmp = strrchr(cfg, ':'); + if (!name || tmp > name) + name = tmp; + } + if (!name) name = cfg; else name++;

1 0

r29603 - trunk/mplayer.c
by reimar 31 Aug '09

31 Aug '09

Author: reimar Date: Mon Aug 31 11:48:25 2009 New Revision: 29603 Log: Factor out code to try and load a config file only if it exists. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Mon Aug 31 11:41:27 2009 (r29602) +++ trunk/mplayer.c Mon Aug 31 11:48:25 2009 (r29603) @@ -913,21 +913,30 @@ static void load_per_output_config (m_co } } +/** + * Tries to load a config file + * @return 0 if file was not found, 1 otherwise + */ +static int try_load_config(m_config_t *conf, const char *file) +{ + struct stat st; + if (stat(file, &st)) + return 0; + mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingConfig, file); + m_config_parse_config_file (conf, file); + return 1; +} + static void load_per_file_config (m_config_t* conf, const char *const file) { char *confpath; char cfg[strlen(file)+10]; - struct stat st; char *name; sprintf (cfg, "%s.conf", file); - if (use_filedir_conf && !stat (cfg, &st)) - { - mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingConfig, cfg); - m_config_parse_config_file (conf, cfg); + if (use_filedir_conf && try_load_config(conf, cfg)) return; - } if ((name = strrchr (cfg, '/')) == NULL) name = cfg; @@ -936,11 +945,7 @@ static void load_per_file_config (m_conf if ((confpath = get_path (name)) != NULL) { - if (!stat (confpath, &st)) - { - mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingConfig, confpath); - m_config_parse_config_file (conf, confpath); - } + try_load_config(conf, confpath); free (confpath); }

1 0

r29602 - trunk/parser-cfg.c
by reimar 31 Aug '09

31 Aug '09

Author: reimar Date: Mon Aug 31 11:41:27 2009 New Revision: 29602 Log: Move variable declaration into block where it is used and make it const. Modified: trunk/parser-cfg.c Modified: trunk/parser-cfg.c ============================================================================== --- trunk/parser-cfg.c Mon Aug 31 11:40:04 2009 (r29601) +++ trunk/parser-cfg.c Mon Aug 31 11:41:27 2009 (r29602) @@ -252,7 +252,6 @@ int m_config_preparse_command_line(m_con { int msg_lvl, i, r, ret = 0; char* arg; - m_option_t* opt; // Hack to shutup the parser error messages. msg_lvl = mp_msg_levels[MSGT_CFGPARSER]; @@ -261,6 +260,7 @@ int m_config_preparse_command_line(m_con config->mode = M_COMMAND_LINE_PRE_PARSE; for(i = 1 ; i < argc ; i++) { + const m_option_t* opt; arg = argv[i]; // Ignore non option if(arg[0] != '-' || arg[1] == 0) continue;

1 0

r29601 - in trunk: parser-cfg.c parser-cfg.h
by reimar 31 Aug '09

31 Aug '09

Author: reimar Date: Mon Aug 31 11:40:04 2009 New Revision: 29601 Log: Make m_config_parse_config_file file name argument const Modified: trunk/parser-cfg.c trunk/parser-cfg.h Modified: trunk/parser-cfg.c ============================================================================== --- trunk/parser-cfg.c Mon Aug 31 11:35:56 2009 (r29600) +++ trunk/parser-cfg.c Mon Aug 31 11:40:04 2009 (r29601) @@ -35,7 +35,7 @@ static int recursion_depth = 0; * \param conffile Path to the config file. * \return 1 on sucess, -1 on error. */ -int m_config_parse_config_file(m_config_t* config, char *conffile) +int m_config_parse_config_file(m_config_t* config, const char *conffile) { #define PRINT_LINENUM mp_msg(MSGT_CFGPARSER,MSGL_V,"%s(%d): ", conffile, line_num) #define MAX_LINE_LEN 10000 Modified: trunk/parser-cfg.h ============================================================================== --- trunk/parser-cfg.h Mon Aug 31 11:35:56 2009 (r29600) +++ trunk/parser-cfg.h Mon Aug 31 11:40:04 2009 (r29601) @@ -3,7 +3,7 @@ #include "m_config.h" -int m_config_parse_config_file(m_config_t* config, char *conffile); +int m_config_parse_config_file(m_config_t* config, const char *conffile); int m_config_preparse_command_line(m_config_t *config, int argc, char **argv);

1 0

r29600 - trunk/libmpdemux/mp_taglists.c
by cehoyos 31 Aug '09

31 Aug '09

Author: cehoyos Date: Mon Aug 31 11:35:56 2009 New Revision: 29600 Log: Fix MPEG-4 ASP in MPEG transport streams with -demuxer lavf. Modified: trunk/libmpdemux/mp_taglists.c Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Mon Aug 31 11:09:00 2009 (r29599) +++ trunk/libmpdemux/mp_taglists.c Mon Aug 31 11:35:56 2009 (r29600) @@ -60,6 +60,7 @@ static const AVCodecTag mp_codecid_overr { CODEC_ID_DTS, 0x2001}, { CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')}, { CODEC_ID_H264, MKTAG('H', '2', '6', '4')}, + { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'V')}, { CODEC_ID_PCM_BLURAY, MKTAG('B', 'P', 'C', 'M')}, { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')}, { CODEC_ID_PCM_U8, 1},

1 0

r29597 - trunk/libmpdemux/mp_taglists.c
by cehoyos 31 Aug '09

31 Aug '09

Author: cehoyos Date: Mon Aug 31 10:42:36 2009 New Revision: 29597 Log: Fix AAC in MPEG transport streams with -demuxer lavf. Modified: trunk/libmpdemux/mp_taglists.c Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Mon Aug 31 10:31:12 2009 (r29596) +++ trunk/libmpdemux/mp_taglists.c Mon Aug 31 10:42:36 2009 (r29597) @@ -57,6 +57,7 @@ const struct AVCodecTag *mp_wav_taglists static const AVCodecTag mp_codecid_override_tags[] = { { CODEC_ID_AAC, MKTAG('M', 'P', '4', 'A')}, { CODEC_ID_AC3, 0x2000}, + { CODEC_ID_DTS, 0x2001}, { CODEC_ID_H264, MKTAG('H', '2', '6', '4')}, { CODEC_ID_PCM_BLURAY, MKTAG('B', 'P', 'C', 'M')}, { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')},

3 2

[propchange]: r29597 - svn:log
by cehoyos 31 Aug '09

31 Aug '09

Author: cehoyos Revision: 29597 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Fix AAC in MPEG transport streams with -demuxer lavf. \ No newline at end of file +Fix DTS in MPEG transport streams with -demuxer lavf.

1 0

r29599 - trunk/libmpdemux/mp_taglists.c
by cehoyos 31 Aug '09

31 Aug '09

Author: cehoyos Date: Mon Aug 31 11:09:00 2009 New Revision: 29599 Log: Fix EAC3 in MPEG transport streams with -demuxer lavf. Patch by Wang William, william0wang gmail Modified: trunk/libmpdemux/mp_taglists.c Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Mon Aug 31 11:00:37 2009 (r29598) +++ trunk/libmpdemux/mp_taglists.c Mon Aug 31 11:09:00 2009 (r29599) @@ -58,6 +58,7 @@ static const AVCodecTag mp_codecid_overr { CODEC_ID_AAC, MKTAG('M', 'P', '4', 'A')}, { CODEC_ID_AC3, 0x2000}, { CODEC_ID_DTS, 0x2001}, + { CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')}, { CODEC_ID_H264, MKTAG('H', '2', '6', '4')}, { CODEC_ID_PCM_BLURAY, MKTAG('B', 'P', 'C', 'M')}, { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')},

1 0