December 2010 - MPlayer-cvslog - lists.mplayerhq.hu

r32724 - trunk/configure
by reimar 06 Jan '11

06 Jan '11

Author: reimar Date: Sun Dec 19 23:02:52 2010 New Revision: 32724 Log: Compilation fixes for currentl Cygwin. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Dec 19 15:19:04 2010 (r32723) +++ trunk/configure Sun Dec 19 23:02:52 2010 (r32724) @@ -1519,6 +1519,12 @@ if win32 ; then def_priority="#define CONFIG_PRIORITY 1" fi +if cygwin ; then + # e.g. priority.c needs _WIN32 define, but + # latest cygwin no longer defines it + extra_cflags="-D_WIN32 $extra_cflags" +fi + if mingw32 ; then _getch=getch2-win.c _need_shmem=no @@ -6622,7 +6628,10 @@ echores "$_faac" echocheck "FAAD2 support" if test "$_faad_internal" = auto ; then - if x86_32 && test cc_vendor=gnu; then + if cygwin ; then + _faad_internal=no + res_comment="does not compile on cygwin" + elif x86_32 && test cc_vendor=gnu; then case $cc_version in 3.1*|3.2) # ICE/insn with these versions _faad_internal=no

3 15

r32739 - trunk/DOCS/tech/dvdnav-howto.txt
by reimar 05 Jan '11

05 Jan '11

Author: reimar Date: Fri Dec 31 17:13:47 2010 New Revision: 32739 Log: Remove dvdnav-howto.txt, it is unnecessary and contains no information at all that is still useful. It actually suggests commands that seem to cause MPlayer to fail to compile. Deleted: trunk/DOCS/tech/dvdnav-howto.txt

3 2

r32709 - trunk/etc/example.conf
by compn 05 Jan '11

05 Jan '11

Author: compn Date: Sun Dec 12 18:16:59 2010 New Revision: 32709 Log: add some profile information Modified: trunk/etc/example.conf Modified: trunk/etc/example.conf ============================================================================== --- trunk/etc/example.conf Sun Dec 12 17:50:13 2010 (r32708) +++ trunk/etc/example.conf Sun Dec 12 18:16:59 2010 (r32709) @@ -10,6 +10,9 @@ # # See the CONFIGURATION FILES section in the man page # for a detailed description of the syntax. +# +# Profiles should be at the bottom of the config file to ensure you dont +# put default options under profiles accidentally. ################## @@ -19,6 +22,11 @@ # Specify vdpau codecs when using -vo vdpau. #[vo.vdpau] #vc=ffmpeg12vdpau,ffwmv3vdpau,ffvc1vdpau,ffh264vdpau,ffodivxvdpau, +# Most video filters do not work with vdpau. +#vf-clr=yes + +# Make sure options under vo.vdpau profile are counted when vdpau is not used +#[default] # Specify default video driver (see -vo help for a list). #vo=xv

3 4

r32731 - in trunk: path.c path.h
by cboesch 03 Jan '11

03 Jan '11

Author: cboesch Date: Sat Dec 25 00:09:08 2010 New Revision: 32731 Log: Add mp_path_is_absolute function. Modified: trunk/path.c trunk/path.h Modified: trunk/path.c ============================================================================== --- trunk/path.c Sat Dec 25 00:05:49 2010 (r32730) +++ trunk/path.c Sat Dec 25 00:09:08 2010 (r32731) @@ -233,3 +233,15 @@ char *mp_dirname(const char *path) dirname[len] = '\0'; return dirname; } + +/** + * @brief Indicates weither the path is absolute or not. + */ +int mp_path_is_absolute(const char *path) +{ +#if HAVE_DOS_PATHS + return path[0] && path[1] == ':'; +#else + return path[0] == '/'; +#endif +} Modified: trunk/path.h ============================================================================== --- trunk/path.h Sat Dec 25 00:05:49 2010 (r32730) +++ trunk/path.h Sat Dec 25 00:09:08 2010 (r32731) @@ -28,5 +28,6 @@ void set_path_env(void); void set_codec_path(const char *path); const char *mp_basename(const char *path); char *mp_dirname(const char *path); +int mp_path_is_absolute(const char *path); #endif /* MPLAYER_PATH_H */

4 13

r32738 - trunk/configure
by reimar 31 Dec '10

31 Dec '10

Author: reimar Date: Fri Dec 31 17:04:57 2010 New Revision: 32738 Log: Make internal FFmpeg use the new API that does not pose a limit on the maximum number of streams. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Dec 31 08:21:29 2010 (r32737) +++ trunk/configure Fri Dec 31 17:04:57 2010 (r32738) @@ -6938,7 +6938,7 @@ test -d ffmpeg/libavutil || die "MPlayer will not compile without libavutil in the source tree." ffmpeg=no if test "$ffmpeg_a" = auto ; then - test -d ffmpeg/libavcore && ffmpeg_a=yes && ffmpeg=yes + test -d ffmpeg/libavcore && ffmpeg_a=yes && ffmpeg=yes && extra_cflags="$extra_cflags -DFF_API_MAX_STREAMS=0" elif test "$ffmpeg_so" = auto ; then ffmpeg_so=no if $_pkg_config --exists libavcore ; then

1 0

r32736 - trunk/configure
by reimar 30 Dec '10

30 Dec '10

Author: reimar Date: Thu Dec 30 13:48:03 2010 New Revision: 32736 Log: Define CONFIG_GPL in config.asm, fixes compilation with YASM. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Dec 27 11:02:23 2010 (r32735) +++ trunk/configure Thu Dec 30 13:48:03 2010 (r32736) @@ -8829,6 +8829,7 @@ cmp -s "$TMPH" ffmpeg/libavutil/avconfig if x86; then # Create a skeleton config.asm with just the ARCH_ definitions for FFmpeg. > "$TMPS" +echo "%define CONFIG_GPL" >> "$TMPS" for part in $arch $subarch; do part=$(echo $part | tr '[a-z]' '[A-Z]') echo "%define ARCH_${part}" >> "$TMPS"

1 0

[propchange]: r32288 - svn:log
by diego 26 Dec '10

26 Dec '10

Author: diego Revision: 32288 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,4 +1,4 @@ -Mark functs not used outside of the file as static, remove from header; fixes: +Mark funcs not used outside of the file as static, remove from header; fixes: libvo/vesa_lvo.c:187: warning: no previous prototype for 'vlvo_draw_slice' libvo/vesa_lvo.c:205: warning: no previous prototype for 'vlvo_draw_frame' libvo/vesa_lvo.c:214: warning: no previous prototype for 'vlvo_flip_page'

1 0

r32734 - trunk/mplayer.c
by cboesch 25 Dec '10

25 Dec '10

Author: cboesch Date: Sat Dec 25 17:58:00 2010 New Revision: 32734 Log: Remove pointless case braces. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat Dec 25 00:15:49 2010 (r32733) +++ trunk/mplayer.c Sat Dec 25 17:58:00 2010 (r32734) @@ -391,21 +391,17 @@ static int is_valid_metadata_type (metad case META_VIDEO_CODEC: case META_VIDEO_BITRATE: case META_VIDEO_RESOLUTION: - { if (!mpctx->sh_video) return 0; break; - } /* check for valid audio stream */ case META_AUDIO_CODEC: case META_AUDIO_BITRATE: case META_AUDIO_SAMPLES: - { if (!mpctx->sh_audio) return 0; break; - } /* check for valid demuxer */ case META_INFO_TITLE: @@ -415,11 +411,9 @@ static int is_valid_metadata_type (metad case META_INFO_COMMENT: case META_INFO_TRACK: case META_INFO_GENRE: - { if (!mpctx->demuxer) return 0; break; - } default: break; @@ -991,16 +985,16 @@ static int libmpdemux_was_interrupted(in switch(cmd->id) { case MP_CMD_QUIT: exit_player_with_rc(EXIT_QUIT, (cmd->nargs > 0)? cmd->args[0].v.i : 0); - case MP_CMD_PLAY_TREE_STEP: { + case MP_CMD_PLAY_TREE_STEP: eof = (cmd->args[0].v.i > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY; mpctx->play_tree_step = (cmd->args[0].v.i == 0) ? 1 : cmd->args[0].v.i; - } break; - case MP_CMD_PLAY_TREE_UP_STEP: { + break; + case MP_CMD_PLAY_TREE_UP_STEP: eof = (cmd->args[0].v.i > 0) ? PT_UP_NEXT : PT_UP_PREV; - } break; - case MP_CMD_PLAY_ALT_SRC_STEP: { + break; + case MP_CMD_PLAY_ALT_SRC_STEP: eof = (cmd->args[0].v.i > 0) ? PT_NEXT_SRC : PT_PREV_SRC; - } break; + break; } mp_cmd_free(cmd); }

1 0

r32733 - trunk/sub/subreader.c
by cboesch 24 Dec '10

24 Dec '10

Author: cboesch Date: Sat Dec 25 00:15:49 2010 New Revision: 32733 Log: Use '@' Doxygen syntax in subreader module. Modified: trunk/sub/subreader.c Modified: trunk/sub/subreader.c ============================================================================== --- trunk/sub/subreader.c Sat Dec 25 00:13:37 2010 (r32732) +++ trunk/sub/subreader.c Sat Dec 25 00:15:49 2010 (r32733) @@ -2371,12 +2371,12 @@ void sub_free( sub_data * subd ) #define MAX_SUBLINE 512 /** - * \brief parse text and append it to subtitle in sub - * \param sub subtitle struct to add text to - * \param txt text to parse - * \param len length of text in txt - * \param endpts pts at which this subtitle text should be removed again - * \param strip_markup if strip markup is set (!= 0), markup tags like <b></b> are ignored + * @brief parse text and append it to subtitle in sub + * @param sub subtitle struct to add text to + * @param txt text to parse + * @param len length of text in txt + * @param endpts pts at which this subtitle text should be removed again + * @param strip_markup if strip markup is set (!= 0), markup tags like <b></b> are ignored * * <> and {} are interpreted as comment delimiters, "\n", "\N", '\n', '\r' * and '\0' are interpreted as newlines, duplicate, leading and trailing @@ -2452,11 +2452,11 @@ void sub_add_text(subtitle *sub, const c #define MP_NOPTS_VALUE (-1LL<<63) /** - * \brief remove outdated subtitle lines. - * \param sub subtitle struct to modify - * \param pts current pts. All lines with endpts <= this will be removed. + * @brief remove outdated subtitle lines. + * @param sub subtitle struct to modify + * @param pts current pts. All lines with endpts <= this will be removed. * Use MP_NOPTS_VALUE to remove all lines - * \return 1 if sub was modified, 0 otherwise. + * @return 1 if sub was modified, 0 otherwise. */ int sub_clear_text(subtitle *sub, double pts) { int i = 0;

1 0

r32732 - trunk/path.c
by cboesch 24 Dec '10

24 Dec '10

Author: cboesch Date: Sat Dec 25 00:13:37 2010 New Revision: 32732 Log: Add brief description for mp_basename. Modified: trunk/path.c Modified: trunk/path.c ============================================================================== --- trunk/path.c Sat Dec 25 00:09:08 2010 (r32731) +++ trunk/path.c Sat Dec 25 00:13:37 2010 (r32732) @@ -194,6 +194,9 @@ void set_codec_path(const char *path) needs_free = 1; } +/** + * @brief Returns the basename substring of a path. + */ const char *mp_basename(const char *path) { char *s;

1 0