1
mirror of https://github.com/mpv-player/mpv synced 2025-01-01 04:36:24 +01:00
Commit Graph

26623 Commits

Author SHA1 Message Date
Uoti Urpala
2faffe2a7f Merge svn changes up to r26555 2008-04-28 12:15:18 +03:00
diego
ae09115f2b Merge mp3lib/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26555 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-27 22:53:18 +00:00
diego
835f0aaae6 Merge liba52/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26554 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-27 11:46:56 +00:00
diego
f9857014b5 Remove unnecessary compilation command that shadows GNU Make builtin command.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26553 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-27 11:00:06 +00:00
diego
15aeb0c9ca Remove unnecessary -lm linker flag from test program compilation command.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26552 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-27 10:34:24 +00:00
Uoti Urpala
38d50e9369 Add .gitignore files 2008-04-27 04:59:37 +03:00
diego
83740c48da Merge libmpeg2/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26551 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 18:02:23 +00:00
diego
5e90929e2d clean and distclean rules do the same thing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26550 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 16:59:26 +00:00
diego
67d6784626 clean and distclean rules do the same thing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26549 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 16:58:15 +00:00
Uoti Urpala
1b84ccbbfc vd.c: Make extern decoder declarations const
The earlier commit "Make video decoder description structs const"
made the definitions const but didn't change the extern declarations
in vd.c to match. Fix those to be const too.
2008-04-26 16:53:47 +03:00
Uoti Urpala
170d69a71e Make audio decoder description structs const
Make the per-decoder struct ad_functions and its ->info struct
constants. Same for the mpcodecs_ad_drivers[] table of pointers to
those structs.
2008-04-26 16:51:17 +03:00
Uoti Urpala
def7ed045d vf_divtc.c: Make pointlessly static variable a normal local
Apparently because it was declared together with local constant tables
(for which the "static" part was useless but harmless) a pointer
variable was also declared static.
2008-04-26 16:38:40 +03:00
Uoti Urpala
05ad815133 Mark some constant symbols as such 2008-04-26 16:35:40 +03:00
diego
3f94c61854 Merge vidix/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26548 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 12:47:24 +00:00
Uoti Urpala
37e1edee35 Move initialized_flags to mpctx
The function exit_sighandler had a line
  if(initialized_flags==0 && sig_count>1) exit(1);
rather than try to make this work without the variable I just removed
the line as it looks unlikely this condition would occur except very
rarely.
2008-04-26 15:31:39 +03:00
Uoti Urpala
80d43e8632 Move global filename to mpctx 2008-04-26 15:17:51 +03:00
diego
dc7ffa9855 Merge clean and distclean rules.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26547 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 11:17:17 +00:00
Uoti Urpala
ae0f9e2658 Disable automatic playlist parsing properly
The playlist code is unsafe to use with potentially hostile sources.
It was disabled by default for local files but not for network streams.
Make sure it is not automatically triggered for network streams either.
2008-04-26 14:04:55 +03:00
diego
03bfbfb8ca Mark alltools target as phony.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26546 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 10:59:33 +00:00
diego
21c9bd3b8b Only compile libmpcodecs/ve_qtvideo.c on Windows.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26545 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 10:53:32 +00:00
diego
be85def657 Add alltools target and variable to build non-linking tools.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26544 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 09:31:05 +00:00
diego
062a179f5f Only add vidix to parts when VIDIX is enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26543 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 09:27:58 +00:00
diego
6b593fd363 Take Objective C files into account when generating dependencies.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26542 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 09:19:41 +00:00
diego
e362640899 Add rule for generating dependency files from Objective C files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26541 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 09:16:15 +00:00
Uoti Urpala
529d106627 Silence "discards qualifiers" warnings when compiling mplayer.c
Add casts to subconfig entries in option lists to avoid the excessive
amount of "initialization discards qualifiers from pointer target
type" warnings. Also add const to the type of mpctx_get_audio_out to
eliminate a warning and make it match the type in the header (svn
r25793 had added a const to the header but not mplayer.c). Make
libmenu_vfs a table of pointers to const to eliminate another warning
plus make the table itself const.
2008-04-26 11:03:12 +03:00
Uoti Urpala
fb33e286b5 Move global mconfig to mpctx
The global was used in the function cfg_include which handles the
-include option. Make the address available in that function by
creating a new dynamically allocated option in m_config_new that has
the address in the option's private data.

asxparser.c also used the global. Making it available through all ways
the code could get called required a number of relatively straightforward
changes to playtree and menu code.
2008-04-26 10:44:59 +03:00
Uoti Urpala
6be229cbbf options: Fix multiple -v by simplifying CONF_TYPE_FUNC
The CONF_TYPE_FUNC implementation counted how many times the option
had appeared and called the function that many times when it was set.
However each -v on the command line triggered an increase of the count
_and_ as many calls as the current count indicated. Thus the resulting
verbosity levels for 0 to 5 -v were really 0, 1, 3, 6, 10, 15 instead
of 0, 1, 2, 3, 4, 5.

Remove the counting functionality and just call the given function
once at each set operation. This fixes -v; other options are not
affected.
2008-04-26 09:40:35 +03:00
Uoti Urpala
98b959ae1f options: Remove "reset" functionality from CONF_TYPE_FUNC[_PARAM]
The "reset to default before setting to something else" functionality
is not used by any current option, but prevents using the "priv" field
of the option data for anything else.
2008-04-26 09:40:34 +03:00
Uoti Urpala
2b47fd59ab Merge svn changes up to r26540
Conflicts:

	Makefile
2008-04-26 09:39:09 +03:00
Uoti Urpala
2993acdc31 Convert m_config.c to use talloc 2008-04-26 09:37:29 +03:00
Uoti Urpala
0885f4e5b5 Move vf_settings to options struct 2008-04-26 01:19:29 +03:00
Uoti Urpala
e08c8d6378 options.h: Field order cosmetics
Move correct_pts and user_correct_pts next to each other. loop_times
was accidentally added between them.
2008-04-26 01:19:29 +03:00
Uoti Urpala
4db72f6a80 Move vo_gamma_* to options struct 2008-04-26 01:19:29 +03:00
diego
59f2911c3e Revert accidentally committed changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26540 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 17:07:22 +00:00
diego
ffed0ab3d2 Only add loader to parts if WIN32DLL is enabled.
Plus, some unrelated changes to mp3lib/Makefile committed by accident.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26539 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 16:58:31 +00:00
diego
1a35efe7f7 Ignore test program.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26538 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 16:54:24 +00:00
diego
fb145ef6bc Only compile decode_i586.c on x86_32.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26537 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 16:51:58 +00:00
diego
e58ca8c5da Remove useless comments with compilation commands.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26536 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:39:03 +00:00
diego
ba6cc3387e Fix test program linking.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26535 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:37:47 +00:00
diego
ef59dbd347 Add return statement, fixes the warning:
test.c:75: warning: control reaches end of non-void function


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26534 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:34:26 +00:00
diego
8aa012384d Remove redundant declaration, fixes the warning:
test.c:15: warning: redundant redeclaration of 'gCpuCaps'
../cpudetect.h:53: warning: previous declaration of 'gCpuCaps' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26533 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:33:43 +00:00
diego
c41f3b9244 Add return statement, fixes the warning:
test2.c:72: warning: control reaches end of non-void function


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26532 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:32:26 +00:00
diego
d0e5a5224b Remove unused variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26531 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:30:43 +00:00
diego
b8d8895381 Add missing #include, fixes the warning:
test2.c:65: warning: implicit declaration of function 'memcpy'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26530 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:30:12 +00:00
diego
3b68802ccc Take name of getch file to link against from config.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26529 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:28:33 +00:00
diego
61d97d630e Merge dvdread/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26528 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-25 08:25:17 +00:00
Uoti Urpala
a0de759a21 command.c: cosmetic changes ("type * ptr" -> "type *ptr")
These "type * ptr" cases were left in parameter lists from earlier
automatic reindent. The "indent" binary does that when the type is an
unrecognized typedef type.
2008-04-25 07:19:10 +03:00
Uoti Urpala
31db39d8ec Make video decoder description structs const
This makes the per-decoder struct vd_functions and its ->info
struct constants. Same for the mpcodecs_vd_drivers[] table of
pointers to those structs.
2008-04-25 07:16:32 +03:00
Uoti Urpala
7dc4226348 Move vd_use_slices to options struct 2008-04-25 07:15:07 +03:00
Uoti Urpala
bb679dd40a Remove global vo_flags
Move the information to struct sh_video field.
2008-04-25 07:15:07 +03:00