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

r29352 - trunk/libmpcodecs/vf_fspp.c
by gpoirier 22 Jun '09

22 Jun '09

Author: gpoirier Date: Sun Jun 7 16:42:43 2009 New Revision: 29352 Log: replace "g" asm constraint by "erm" since "g" allows 64bit immediates while the operator (cmp) using the "g"-constrained operand doesn't support 64bit immediates. Original thread: date: Tue, Jun 2, 2009 at 11:31 AM subject: [PATCH] Fix MPlayer to compile on Darwin/x86_86 Modified: trunk/libmpcodecs/vf_fspp.c Modified: trunk/libmpcodecs/vf_fspp.c ============================================================================== --- trunk/libmpcodecs/vf_fspp.c Sat Jun 6 11:37:46 2009 (r29351) +++ trunk/libmpcodecs/vf_fspp.c Sun Jun 7 16:42:43 2009 (r29352) @@ -240,7 +240,7 @@ static void store_slice_mmx(uint8_t *dst "jl 2b \n\t" : - : "m" (width), "m" (src_stride), "g" (od), "m" (dst_stride), "g" (end), + : "m" (width), "m" (src_stride), "erm" (od), "m" (dst_stride), "erm" (end), "m" (log2_scale), "m" (src), "m" (dst) //input : "%"REG_a, "%"REG_c, "%"REG_d, "%"REG_S, "%"REG_D ); @@ -308,7 +308,7 @@ static void store_slice2_mmx(uint8_t *ds "jl 2b \n\t" : - : "m" (width), "m" (src_stride), "g" (od), "m" (dst_stride), "g" (end), + : "m" (width), "m" (src_stride), "erm" (od), "m" (dst_stride), "erm" (end), "m" (log2_scale), "m" (src), "m" (dst) //input : "%"REG_a, "%"REG_c, "%"REG_d, "%"REG_D, "%"REG_S );

5 6

r29378 - trunk/libmpdemux/demux_ts.c
by reimar 21 Jun '09

21 Jun '09

Author: reimar Date: Sun Jun 21 12:55:41 2009 New Revision: 29378 Log: Remove duplicate printing of ID_AUDIO_ID/ID_VIDEO_ID, those are already printed by the new_sh_... functions. Modified: trunk/libmpdemux/demux_ts.c Modified: trunk/libmpdemux/demux_ts.c ============================================================================== --- trunk/libmpdemux/demux_ts.c Sun Jun 21 12:47:44 2009 (r29377) +++ trunk/libmpdemux/demux_ts.c Sun Jun 21 12:55:41 2009 (r29378) @@ -700,14 +700,12 @@ static off_t ts_detect_streams(demuxer_t if(is_video) { - mp_msg(MSGT_IDENTIFY, MSGL_V, "ID_VIDEO_ID=%d\n", es.pid); chosen_pid = (req_vpid == es.pid); if((! chosen_pid) && (req_vpid > 0)) continue; } else if(is_audio) { - mp_msg(MSGT_IDENTIFY, MSGL_V, "ID_AUDIO_ID=%d\n", es.pid); if (es.lang[0] > 0) mp_msg(MSGT_IDENTIFY, MSGL_V, "ID_AID_%d_LANG=%s\n", es.pid, es.lang); if(req_apid > 0)

1 0

r29377 - trunk/libmpdemux/demux_ts.c
by reimar 21 Jun '09

21 Jun '09

Author: reimar Date: Sun Jun 21 12:47:44 2009 New Revision: 29377 Log: TS demuxer: make the IDs used by DEMUXER_CTRL_SWITCH_* and DEMUXER_CTRL_IDENTIFY_PROGRAM match those printed as ID_VIDEO_ID/ID_AUDIO_ID and accepted with -vid/-aid Modified: trunk/libmpdemux/demux_ts.c Modified: trunk/libmpdemux/demux_ts.c ============================================================================== --- trunk/libmpdemux/demux_ts.c Sat Jun 20 20:18:35 2009 (r29376) +++ trunk/libmpdemux/demux_ts.c Sun Jun 21 12:47:44 2009 (r29377) @@ -3378,14 +3378,9 @@ static int demux_ts_control(demuxer_t *d } else //audio track <n> { - for(i = 0; i < 8192; i++) - { - if(priv->ts.streams[i].id == n && priv->ts.streams[i].type == reftype) - { + if (n >= 8192 || priv->ts.streams[n].type != reftype) return DEMUXER_CTRL_NOTIMPL; + i = n; sh = priv->ts.streams[i].sh; - break; - } - } } if(sh) @@ -3456,12 +3451,12 @@ static int demux_ts_control(demuxer_t *d if(!vid_done && priv->ts.streams[pmt->es[j].pid].type == TYPE_VIDEO) { vid_done = 1; - prog->vid = priv->ts.streams[pmt->es[j].pid].id; + prog->vid = pmt->es[j].pid; } else if(!aid_done && priv->ts.streams[pmt->es[j].pid].type == TYPE_AUDIO) { aid_done = 1; - prog->aid = priv->ts.streams[pmt->es[j].pid].id; + prog->aid = pmt->es[j].pid; } }

1 0

r29376 - trunk/etc/codecs.conf
by kostya 20 Jun '09

20 Jun '09

Author: kostya Date: Sat Jun 20 20:18:35 2009 New Revision: 29376 Log: 1l to Reimar for not updating lavc TM2 decoder output format in codecs.conf Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sat Jun 20 15:19:24 2009 (r29375) +++ trunk/etc/codecs.conf Sat Jun 20 20:18:35 2009 (r29376) @@ -2082,7 +2082,7 @@ videocodec fftm20 fourcc TM20 driver ffmpeg dll truemotion2 - out YV12 + out BGR24 ; our BGR15->BGR32 is bad or the DLL? videocodec tm20

1 0

r29375 - trunk/command.c
by reimar 20 Jun '09

20 Jun '09

Author: reimar Date: Sat Jun 20 15:19:24 2009 New Revision: 29375 Log: Do not use MAX_A/V_STREAMS as upper limit for switch_audio/switch_video They take the stream id as argument, which is not necessarily the same as the as the index in the streams array and can be larger. Modified: trunk/command.c Modified: trunk/command.c ============================================================================== --- trunk/command.c Fri Jun 19 22:21:58 2009 (r29374) +++ trunk/command.c Sat Jun 20 15:19:24 2009 (r29375) @@ -2029,7 +2029,7 @@ static const m_option_t mp_properties[] { "channels", mp_property_channels, CONF_TYPE_INT, 0, 0, 0, NULL }, { "switch_audio", mp_property_audio, CONF_TYPE_INT, - CONF_RANGE, -2, MAX_A_STREAMS - 1, NULL }, + CONF_RANGE, -2, 65535, NULL }, { "balance", mp_property_balance, CONF_TYPE_FLOAT, M_OPT_RANGE, -1, 1, NULL }, @@ -2075,7 +2075,7 @@ static const m_option_t mp_properties[] { "aspect", mp_property_aspect, CONF_TYPE_FLOAT, 0, 0, 0, NULL }, { "switch_video", mp_property_video, CONF_TYPE_INT, - CONF_RANGE, -2, MAX_V_STREAMS - 1, NULL }, + CONF_RANGE, -2, 65535, NULL }, { "switch_program", mp_property_program, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL },

1 0

r29374 - trunk/libvo/x11_common.c
by attila 19 Jun '09

19 Jun '09

Author: attila Date: Fri Jun 19 22:21:58 2009 New Revision: 29374 Log: fix missing event on move that breaks xmga window movement broken in r28541 Modified: trunk/libvo/x11_common.c Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Fri Jun 19 17:29:51 2009 (r29373) +++ trunk/libvo/x11_common.c Fri Jun 19 22:21:58 2009 (r29374) @@ -846,8 +846,9 @@ int vo_x11_check_events(Display * mydisp break; { int old_w = vo_dwidth, old_h = vo_dheight; + int old_x = vo_dx, old_y = vo_dy; vo_x11_update_geometry(); - if (vo_dwidth != old_w || vo_dheight != old_h) + if (vo_dwidth != old_w || vo_dheight != old_h || vo_dx != old_x || vo_dy != old_y) ret |= VO_EVENT_RESIZE; } break;

3 2

[propchange]: r29372 - svn:log
by diego 19 Jun '09

19 Jun '09

Author: diego Revision: 29372 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,2 @@ Fix setting of DOC_LANGS and MAN_LANGS, the wrong variables were being used. +This makes XML documentation generation work again.

1 0

r29372 - trunk/configure
by diego 19 Jun '09

19 Jun '09

Author: diego Date: Fri Jun 19 17:20:59 2009 New Revision: 29372 Log: Fix setting of DOC_LANGS and MAN_LANGS, the wrong variables were being used. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Jun 17 20:40:19 2009 (r29371) +++ trunk/configure Fri Jun 19 17:20:59 2009 (r29372) @@ -8127,9 +8127,9 @@ export LC_ALL = C CONFIGURATION = $_configuration CHARSET = $_charset -DOC_LANGS = $doc_langs +DOC_LANGS = $language_doc DOC_LANG_ALL = $doc_lang_all -MAN_LANGS = $man_langs +MAN_LANGS = $language_man MAN_LANG_ALL = $man_lang_all prefix = \$(DESTDIR)$_prefix

1 0

[propchange]: r29370 - svn:log
by siretart 17 Jun '09

17 Jun '09

Author: siretart Revision: 29370 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -3,5 +3,5 @@ if fontconfig support is actually compil enabled, this patch should have no effect as well. The visible result of this patch is to avoid the warning about a missing -~/.mplayer/subfont.ttf when starting gmplayer without parameters, like -done from the .desktop file. +~/.mplayer/subfont.ttf when starting mplayer (or gmplayer) without +parameters, like done from the .desktop file.

1 0

[propchange]: r29370 - svn:log
by siretart 17 Jun '09

17 Jun '09

Author: siretart Revision: 29370 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,2 +1,7 @@ -enable fontconfig support by default. This change takes only in effect, -if fontconfig support is actually compiled in. +Enable fontconfig support by default. This change takes only in effect, +if fontconfig support is actually compiled in. If freetype is not +enabled, this patch should have no effect as well. + +The visible result of this patch is to avoid the warning about a missing +~/.mplayer/subfont.ttf when starting gmplayer without parameters, like +done from the .desktop file.

1 0