Commit Graph

24180 Commits

Author SHA1 Message Date
diego 7117b5b121 Fix subrip and vivodump linking.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24199 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 17:36:57 +00:00
diego 2d8cbfd19c Ignore modify_reg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24198 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 17:34:19 +00:00
diego 4ed5da4ad7 Mark vfw2menc as Windows-only.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24197 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 17:33:35 +00:00
diego b9fc895dc1 warning fix:
pullup.c: In function 'decide_frame_length':
pullup.c:569: warning: unused variable 'f3'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24196 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 17:15:05 +00:00
diego 529d2f8030 warning fix:
vo_aa.c:89: warning: redundant redeclaration of 'aa_defparams'
/usr/include/aalib.h:371: warning: previous declaration of 'aa_defparams' was here
vo_aa.c:90: warning: redundant redeclaration of 'aa_defrenderparams'
/usr/include/aalib.h:377: warning: previous declaration of 'aa_defrenderparams' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24195 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 17:13:18 +00:00
diego fd16e2f2df warning fix:
mmap_anon.c: In function 'mmap_anon':
mmap_anon.c:37: warning: unused variable 'fd'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24194 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 17:09:09 +00:00
diego 825bfaf480 Fix warning:
In file included from layer3.c:1171,
                 from sr1.c:391:
decod386.c:106: warning: redundant redeclaration of 'synth_1to1_MMX'
mpg123.h:120: warning: previous declaration of 'synth_1to1_MMX' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24193 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 17:05:02 +00:00
diego 6f33963721 warning fix:
demux_mov.c:44: warning: redundant redeclaration of 'vo_sub'
../libvo/sub.h:64: warning: previous declaration of 'vo_sub' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24192 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:56:43 +00:00
diego 505a5f013b Fix warning:
af_sinesuppress.c:34: warning: 'play_float' declared 'static' but never defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24191 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:51:02 +00:00
diego 10830393d6 Remove pointless variable declaration, the code that sets it is long-gone.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24190 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:42:40 +00:00
voroshil aad3231850 10l: "&" should be done after ">>"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24189 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:42:38 +00:00
diego 3b1f4b6167 Remove stray comment, the code it commented is long-gone.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24188 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:41:10 +00:00
voroshil 74083dfe01 Language bits in teletext page header are
control bits C12-C14 (bits 2-4 of d[7]), not C11-C13 (bits 1-3).



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24187 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:39:02 +00:00
diego 5606acf652 Fix warnings:
vo_directfb2.c:1296: warning: unused variable 'rect'
vo_directfb2.c:1295: warning: unused variable 'dsc'
vo_directfb2.c:1294: warning: unused variable 'tmp'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24186 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:32:20 +00:00
diego b0ae2fdd7a Fix warning:
mplayer.c: In function 'generate_video_frame':
mplayer.c:1631: warning: implicit declaration of function 'update_teletext'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24185 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:24:17 +00:00
diego 9482a78e67 Fix warnings:
mplayer.c:316: warning: redundant redeclaration of 'vo_subdevice'
libvo/video_out.h:237: warning: previous declaration of 'vo_subdevice' was here
mplayer.c:317: warning: redundant redeclaration of 'ao_subdevice'
libao2/audio_out.h:44: warning: previous declaration of 'ao_subdevice' was here
mplayer.c:320: warning: redundant redeclaration of 'vo_flags'
libvo/video_out.h:189: warning: previous declaration of 'vo_flags' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24184 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:19:42 +00:00
diego 2c57acb279 Extract a poor int declaration from within the uncouth grip of an if statement
where it lay stranded in violation of both syntax and decency.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24183 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:15:46 +00:00
diego 11dbdc22db Fix warnings:
In file included from mplayer.c:191:
mp_fifo.h:5: warning: redundant redeclaration of 'mplayer_put_key'
mp_core.h:129: warning: previous declaration of 'mplayer_put_key' was here
In file included from command.c:59:
mp_fifo.h:5: warning: redundant redeclaration of 'mplayer_put_key'
mp_core.h:129: warning: previous declaration of 'mplayer_put_key' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24182 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:03:02 +00:00
diego aaf54a6f04 Fix warning:
mencoder.c:137: warning: redundant redeclaration of 'verbose'
mp_msg.h:6: warning: previous declaration of 'verbose' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24181 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 15:53:27 +00:00
rathann 3642a7ff4f Document xorg.conf option needed for Xv playback on Intel cards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24180 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 14:23:15 +00:00
diego da382ab432 Fix warning:
vo_xvidix.c:75: warning: redundant redeclaration of 'xinerama_screen'
video_out.h:193: warning: previous declaration of 'xinerama_screen' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24179 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 13:37:19 +00:00
diego 030020a181 Fix warnings:
In file included from mplayer.c:341:
libass/ass_mp.h:27: warning: redundant redeclaration of 'ass_enabled'
mp_core.h:115: warning: previous declaration of 'ass_enabled' was here
In file included from command.c:58:
mp_core.h:115: warning: redundant redeclaration of 'ass_enabled'
libass/ass_mp.h:27: warning: previous declaration of 'ass_enabled' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24178 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 13:28:25 +00:00
diego a54c7c3ca4 Fix warnings:
In file included from mplayer.c:380:
mpcommon.h:5: warning: redundant redeclaration of 'subdata'
libvo/sub.h:63: warning: previous declaration of 'subdata' was here
In file included from command.c:26:
mpcommon.h:5: warning: redundant redeclaration of 'subdata'
libvo/sub.h:63: warning: previous declaration of 'subdata' was here
In file included from mencoder.c:239:
mpcommon.h:5: warning: redundant redeclaration of 'subdata'
libvo/sub.h:63: warning: previous declaration of 'subdata' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24177 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 13:23:40 +00:00
diego ea338264f4 Add multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24176 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 13:18:29 +00:00
diego 6c2ee72a4c Fix warning:
vo_dfbmga.c:231: warning: redundant redeclaration of 'uninit'
video_out_internal.h:37: warning: previous declaration of 'uninit' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24175 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 13:13:08 +00:00
diego 86354b25dd Move button variable into the if () where it is actually used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24174 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 13:08:49 +00:00
diego 3c8b565e90 Remove redundant extern declarations, #include the right headers instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24173 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 13:05:07 +00:00
gpoirier c6c2cbe5c0 sync w/r24084
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24172 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:51:33 +00:00
diego be4cb72ebe Fix redundant redeclaration warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24171 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:50:05 +00:00
diego d5fe94ec4c Fix unused variable warning when USE_DVDNAV is not defined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24170 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:47:41 +00:00
diego 26691d09f8 Remove redundant extern variable declarations, include proper headers instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24169 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:25:34 +00:00
diego 5dc65565ca Remove redundant variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24168 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:19:16 +00:00
diego a0c2348a70 Remove redundant variable declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24167 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:12:31 +00:00
diego 2322b23431 Remove redundant variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24166 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:10:33 +00:00
diego 5c0d8ece5a Remove redundant variable declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24165 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:04:52 +00:00
diego 6f75e1216c Remove redundant variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24164 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:02:16 +00:00
diego 8d7d86bafc Remove redundant variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24163 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 11:59:28 +00:00
diego 4ea8b17121 Fix some unused variable warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24162 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 09:46:47 +00:00
reimar 2d1a05ce75 Revert r24158, it is not necessary with unsigned bitfield
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24161 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 09:29:27 +00:00
reimar aceb7e5eb8 Change bitfield to unsigned so that we get the usual truth values
(1 = true, 0 = false) instead of -1 for true.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24160 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 09:27:43 +00:00
Gabrov da121e80f9 synced with r24137
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24159 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 09:17:14 +00:00
reimar 5488283cf6 Hack around broken bitfields in gcc 4.2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24158 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 07:35:35 +00:00
reimar cd2a7ee82f Fix invalid fd check, the bug is somewhere else though.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24157 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 07:30:17 +00:00
reimar fde163a48f HACK: check added fds for validity because otherwise mplayer
crashes due to using FD_SET on -1


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24156 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 07:08:49 +00:00
reimar 8adf56e9a3 Fix loads of warnings
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24155 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 06:52:17 +00:00
uau ad5c7d5bb1 Handle queued commands from input event functions immediately
Check whether an event handler called mp_input_queue_cmd and return the
command immediately if so. Currently x11_common.c creates commands from
mouse position updates.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24154 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 04:28:20 +00:00
uau 37babdb3a1 Watch X11 fd in main input select() if using vo xv
Add the X11 fd to main input select() set, and call VO check_events() if
it becomes readable. Only done in vo xv code for now, though would make
sense for other X11-based VOs too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24153 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 04:28:17 +00:00
uau 95a174a65a Add separate event input type for terminal+vo
Add an input/input.c fd type whose read function takes no arguments and
returns no value. If such a function reads key or command events it'll
add them to the queues itself. Use this type for terminal input which
was special-cased before. The event function for X11-based VOs will use
the same type later.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24152 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 04:28:14 +00:00
uau 24802b1def Use a single select() for both key and slave input
Previous code used two separate select() calls one after another, so
that whenever it was running select() on one set of fds events in the
other set would go unnoticed until later. Now there's a single select()
which allows reacting immediately to any input source.

The behavior of the new code differs somewhat from the old; for example
multiple fds that stay readable are no longer handled in a round-robin
fashion and the total amount the process sleeps can differ. Some tuning
might be required later.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24151 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 04:28:11 +00:00
uau 7eb3bc0cf8 Clean up getch2() code somewhat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24150 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 04:28:09 +00:00