1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-01 20:32:13 +00:00
Commit Graph

25548 Commits

Author SHA1 Message Date
diego
60fa2be5d7 consistency cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25575 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 20:05:36 +00:00
diego
d53ff2ca72 Consistently use just the name of the #ifdef directive in #endif comments.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25574 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 20:00:20 +00:00
diego
828f16740d Fix wrong #endif comment that does not match the #ifdef directive.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25573 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 19:59:01 +00:00
diego
e34bdcc26a Port typo fixes from FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25572 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 19:55:41 +00:00
diego
6da8e4a81d Remove compilation command from source file, it is already in the Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25571 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 19:53:51 +00:00
diego
4a36933f7b Fix license header to read Lesser General Public License 2.1,
a Lesser General Public License 2 never existed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25570 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 19:52:23 +00:00
diego
9cf25c26ad unrarlib.o no longer exists, link against unrar_exec.o.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25569 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 19:43:36 +00:00
diego
d6e22603ef Add explanatory comments to #endif preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25568 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 19:36:23 +00:00
nicodvb
7ded17d4c2 include dvdnav.h from its installation directory rather than appending
-Idvdnav to the compilation of the whole mplayer (dvdnav-config was just
cleaned)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25567 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 17:34:57 +00:00
gpoirier
d7a0707953 update copyright year to 2008
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25566 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 17:18:46 +00:00
nicodvb
78d3a0fca5 removed inclusion of unneeded header (forgotten in previous commit)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25565 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 17:03:25 +00:00
nicodvb
d37917abf5 private structures belong to the C file using them, not to header files included somewhere else
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25564 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 17:01:03 +00:00
diego
fba0b66ff9 Add explanatory comments to the #endif part of multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25563 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-31 16:15:50 +00:00
diego
b8ab5e3f36 Add comments to some #endif directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25562 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-31 16:14:38 +00:00
diego
bc6d58fc1d Remove superfluous README file, its content is in the Copyright file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25561 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-31 16:06:14 +00:00
diego
425eb2c9e5 Comment out the correct #endif directive.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25560 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-31 15:57:54 +00:00
diego
da7cc29d3f Relicense files marked as GPL v2 to GPL v2 or later.
Done with permission from Nick Kurshev, the author.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25559 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-31 13:40:08 +00:00
diego
6bda8fe6ec Fix typo in multiple inclusion guard comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25558 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-31 11:51:54 +00:00
diego
496f7332a7 Relicense GPL v2 files as GPL v2+ and add proper license headers.
Done with permission from Michael Niedermayer, the author.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25557 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-31 10:41:20 +00:00
ulion
61f55e9fd7 Default use the dir where the current playing file located if path not set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25556 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-31 01:20:50 +00:00
diego
c98db3f442 Relicense files written by Nick Kurshev and marked as "GPL v2" to
"GPL v2 or later" with permission from Nick.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25555 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 22:40:24 +00:00
diego
44596daef1 Add proper license header.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25554 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 22:15:45 +00:00
diego
71449efc89 Add missing #include, fixes the warning:
vo_xvr100.c: In function 'draw_osd':
vo_xvr100.c:346: warning: implicit declaration of function 'vo_draw_text'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25553 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 12:19:34 +00:00
diego
98a860905e Remove unused variable, fixes the warning:
vo_xvr100.c:139: warning: unused variable 'i'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25552 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 12:17:23 +00:00
diego
8792b72b1e Remove redundant extern declarations, fixes the warnings:
vo_vesa.c:55: warning: redundant redeclaration of #monitor_hfreq_str#
video_out.h:252: warning: previous declaration of #monitor_hfreq_str# was here
vo_vesa.c:56: warning: redundant redeclaration of #monitor_vfreq_str#
video_out.h:253: warning: previous declaration of #monitor_vfreq_str# was here
vo_vesa.c:57: warning: redundant redeclaration of #monitor_dotclock_str#
video_out.h:254: warning: previous declaration of #monitor_dotclock_str# was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25551 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 12:12:47 +00:00
gpoirier
eb6a820c45 sync w/r25529, patch by JRaSH: jrash06 A 163 P com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25550 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 11:20:56 +00:00
diego
8764815186 Remove unused static variables, fixes the warnings:
vo_bl.c: At top level:
vo_bl.c:64: warning: 'yoff' defined but not used
vo_bl.c:64: warning: 'stride' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25549 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 11:07:53 +00:00
diego
6a7f407a96 Remove unused variables, fixes the warnings:
vo_bl.c: In function 'draw_slice':
vo_bl.c:329: warning: unused variable 'src2'
vo_bl.c:328: warning: unused variable 'src1'
vo_bl.c:325: warning: unused variable 'j'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25548 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 11:05:53 +00:00
diego
09260c18d1 Disable unused code, fixes the warning:
vesa_lvo.c: At top level:
vesa_lvo.c:248: warning: 'draw_alpha' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25547 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 10:54:04 +00:00
diego
1dabdaa11e Add missing #include for vo_draw_text.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25546 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 10:52:57 +00:00
diego
2bc0ac1444 Do not duplicate MJpegContext struct, #include the proper header instead.
This also fixes the warnings:
jpeg_enc.c:342: warning: implicit declaration of function 'ff_mjpeg_encode_init'
jpeg_enc.c:384: warning: implicit declaration of function 'ff_mjpeg_encode_picture_header'
jpeg_enc.c:489: warning: implicit declaration of function 'ff_mjpeg_encode_picture_trailer'
jpeg_enc.c:500: warning: implicit declaration of function 'ff_mjpeg_encode_close'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25545 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 10:49:43 +00:00
diego
611e0b9dd0 Add missing #include, fixes the warning:
aspecttest.c: In function 'main':
aspecttest.c:19: warning: implicit declaration of function 'atoi'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25544 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 10:32:33 +00:00
diego
82ee453947 typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25543 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 03:17:04 +00:00
eugeni
e6839faa8d Improve comments for ass_process_* functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25542 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 02:17:16 +00:00
eugeni
bf22a172e7 Return from ass_start_frame immediately if the track is empty.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25541 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 01:03:05 +00:00
Gabrov
3eb3ff7be8 synced with r25539
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25540 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-29 13:56:38 +00:00
diego
021fe627dc Use proper length specifiers in mp_msg calls, fixes the warnings:
vo_zr.c: In function 'init_zoran':
vo_zr.c:228: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int'
vo_zr.c:228: warning: format '%d' expects type 'int', but argument 5 has type 'long unsigned int'
vo_zr.c:237: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int'
vo_zr.c:237: warning: format '%d' expects type 'int', but argument 5 has type 'long unsigned int'
vo_zr.c:241: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int'
vo_zr.c:241: warning: format '%d' expects type 'int', but argument 5 has type 'long unsigned int'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25539 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-28 23:25:02 +00:00
diego
921cef29ce Fix warnings when compiling test application.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25538 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-28 23:12:20 +00:00
eugeni
0df97d663b Fix update_subtitles() checking subtitle type for the wrong track.
update_subtitles() uses 'type' field from d_dvdsub even when some other track
is active. For this reason, external vobsub is not displayed when there is at
least one text track from demuxer (type is always 't' or 'a' in this case).
The solution is to check vobsub_id and dvdsub_id instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25537 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-28 20:57:38 +00:00
ptt
0448771775 synced with r25455
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25536 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-28 18:56:50 +00:00
eugeni
43de62a54d Add detection of *lrint* and round* functions to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25535 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-28 17:23:57 +00:00
diego
a9d779578d Make windres binary name configurable, useful for cross-compiling.
patch by sheba, sheba469 yahoo com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25534 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-28 10:33:22 +00:00
ulion
1fbd5fb5f4 Remove redundant option 'auto-close' from cmdlist and filesel.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25533 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-28 03:45:01 +00:00
diego
1686f19335 typo in preprocessor condition
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25532 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-27 12:27:10 +00:00
diego
13e29fcfe2 Remove unused static variable pass, fixes the warning:
ae_lame.c:72: warning: 'pass' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25531 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-27 11:19:54 +00:00
ulion
b6870cc5ba From now on, libmenu does not steal all input keys from input modules.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25530 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-26 13:13:48 +00:00
ulion
2b517dc714 Support ?(!NAME:TEXT) format for expanding string by property.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25529 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-26 04:15:56 +00:00
reimar
9e434fa014 Add a missing free of the avctx
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25528 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-25 12:22:50 +00:00
ulion
967aaee5e2 Use '-' instead of '_' in option name.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25527 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-25 09:01:51 +00:00
ulion
76f10103ba Remove useless scope.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25526 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-25 08:38:09 +00:00