Commit Graph

25259 Commits

Author SHA1 Message Date
zuxy ea9b477dc7 Return correct length in ID_VCD_TRACK_n_MSF
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25186 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-28 11:34:01 +00:00
ulion e3c9524d66 Set protocol for the vo proxy used in shared-buffer mode.
NOTE: You have to update your mplayerosx to svn r148 or newer to work with it.
This change will speed up vo proxy and fix all these warnings:
vo_macosx.m: In function 'config':
vo_macosx.m:165: warning: 'NSProxy' may not respond to '-startWithWidth:withHeight:withBytes:withAspect:'
vo_macosx.m:165: warning: (Messages without a matching method signature
vo_macosx.m:165: warning: will be assumed to return 'id' and accept
vo_macosx.m:165: warning: '...' as arguments.)
vo_macosx.m: In function 'flip_page':
vo_macosx.m:183: warning: 'NSProxy' may not respond to '-render'
vo_macosx.m: In function 'uninit':
vo_macosx.m:235: warning: 'NSProxy' may not respond to '-stop'
vo_macosx.m: In function 'control':
vo_macosx.m:334: warning: 'NSProxy' may not respond to '-ontop'
vo_macosx.m:336: warning: 'NSProxy' may not respond to '-toggleFullscreen'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25185 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-28 00:01:35 +00:00
lu_zero 8e18e41638 Enable -rtsp-port for nemesi
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25184 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-27 21:31:47 +00:00
lu_zero d4e14ef53e Remove stray var
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25183 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-27 21:17:20 +00:00
ptt 2f7f48d5fe synced with r25179
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25182 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-27 17:12:07 +00:00
ulion e36b3815d8 Added myself, as suggested by Diego.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25181 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-27 12:31:27 +00:00
ulion e6960e2908 Takeover as maintainer of mplayer osx port with Nicolas' blessing.
Nicolas will still take care of the MPlayer OS X frontend.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25180 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-27 12:03:15 +00:00
diego 329da019df Add missing forced linebreak, slight wording improvement.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25179 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-27 10:49:36 +00:00
ulion 7961a457ba Use const char * to replace a char * parameter.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25178 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-27 08:27:20 +00:00
ulion facdbc77aa Fix warnings:
ad_hwac3.c: In function 'decode_audio_dts':
ad_hwac3.c:499: warning: passing argument 1 of 'convert_14bits_to_16bits' from incompatible pointer type
ad_hwac3.c:499: warning: passing argument 2 of 'convert_14bits_to_16bits' from incompatible pointer type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25177 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-27 00:33:59 +00:00
ptt 97dc493b5f synced with r24954
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25176 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 23:24:22 +00:00
ptt 3be452d9b1 synced with r24604
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25175 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 22:57:14 +00:00
ptt 0dbae3ec13 synced with r24346
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25174 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 22:12:38 +00:00
ptt 28ed3bd8fb was synced to r25017, my fault sorry
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25173 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 21:44:58 +00:00
ptt d348839691 synced with r25011
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25172 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 21:43:07 +00:00
ptt 84df331d21 synced with r25146
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25171 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 21:24:26 +00:00
ptt da81ae180d synced with 25158
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25170 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 21:06:21 +00:00
reimar 2e369b6908 100l in play_tree_parser_get_line, check that there actually is
a previous character before comparing it against '\r'.
Fixes a possible crash on playlist file that is empty or starts with an empty line.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25169 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 20:35:27 +00:00
reimar b32b64d559 Replace http:// URLs in asx files by mmshttp://.
Avoid some infinite-loop problems when stream and playlist have the same URL.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25168 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 19:04:31 +00:00
reimar a4533bdb84 Simplify convert_14bits_to_16bits function in ad_hwac3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25167 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 19:01:34 +00:00
voroshil 84170d0b24 Add missing '\n' in tv scanner results output.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25166 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 10:04:18 +00:00
ulion 3208da3545 Fix warning on Leopard, tested ok on Tiger:
vo_macosx.m: In function '-[MPlayerOpenGLView config]':
vo_macosx.m:387: warning: passing argument 1 of 'setValues:forParameter:' from incompatible pointer type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25165 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 03:06:16 +00:00
ulion e876561a9e Fix warning:
vo_macosx.m:251: warning: ISO C90 forbids mixed declarations and code


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25164 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 02:57:02 +00:00
ulion 0bb30d41b3 Support stream redirection from http to mms, fix bug #927.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25163 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 00:41:21 +00:00
ulion 88f37769f2 Fix code to make sure the browse starting path within the menu-chroot path.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25162 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 00:28:05 +00:00
nicodvb 8b8b9ada52 10l, removing the conditional bitfields from (audio|sub)_mapping_t requires the big->native conversion
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25161 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-25 21:45:35 +00:00
diego d553a2cea1 Restore copyright/license notices that were stripped off.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25160 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-25 16:44:33 +00:00
diego 65c2ef963f Remove mapdev.vxd. It is a non-free Win9x/DOS binary and its usage remains
obscure.  In the unlikely case that someone should need it, it is archived at
http://www1.mplayerhq.hu/MPlayer/contrib/win32/
Blessed by Benjamin.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25159 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-25 15:32:18 +00:00
ulion a98b73bfe9 Make up missed update for osd message.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25158 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-25 12:46:03 +00:00
ulion 595de9b1fc Support select subtitle by source, add 4 properties:
1. sub_source for current sub source (sub file, vobsub, or from demuxer).
2. sub_file for all subtitles from files.
3. sub_vobsub for all subtitles from vobsub.
4. sub_demux for all subtitles from demuxer.
Now mplayer can supply a stable and clear interface to external programs
using mplayer in slave mode to select a subtitle by its source and
its unique id for that source printed by mplayer using -identify parameter. 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25157 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-25 04:09:04 +00:00
cehoyos f540e17b34 Since FFmpeg r11077, some muxers/demuxers don't exist in libavformat anymore.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25156 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-24 13:14:40 +00:00
voroshil e4e63d7a04 Revert r25089 (Ignore video formats which are supported by device
but not supported by dshow driver).

It prevents code from r25091 (probing undeclared formats) functioning
properly: those code is never called if all declared by device formats
are unsupported by MPlayer (even if undeclared one is supported).

After this revert PVR-150 card should work as expected.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25155 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-24 07:51:31 +00:00
voroshil d0fa6cd8c8 Move requested format at top and shift all oters down
This method is better with recent negotiation code:
requested formats will be checked first.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25154 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-24 07:28:05 +00:00
voroshil fd10d43723 Сreate empty format arrays in case of error in init_chain_common.
Fixes segfault for cards without audio capture pin
in main capture filter.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25153 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-24 06:01:18 +00:00
ulion 33ae3abe14 Support convert 14-bit DTS stream into 16-bit stream if needed,
so we have space to add the IEC header for it.
DTS WAV/CD normally is 14-bit LE format, now we can passthrough it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25152 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-24 01:35:29 +00:00
nicodvb 298f569c21 pgc->subp_control and pgc->audio_control are no more bitfields,
but plain uint32_t and uint16_t respectively; replaced access
to bitfield members with bitmask operations (and removed some 
ugly macro)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25151 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-23 21:12:11 +00:00
nicodvb a8449bf462 replaced audio_mapping_t and sub_mapping_t with uint16_t and uint32_t
respectively: conditional bitfields don't have the slightest chance
to be cross-platform, thus they are definitively broken.
Fixed the other files to use bitmasks instead of accessing the
previous bitfield members


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25150 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-23 21:09:06 +00:00
ulion 9ba75c2ccf Fix memory leak of image_data.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25149 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-23 13:46:38 +00:00
ulion df036d0bf5 Fix a memory leak when working in shared_buffer mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25148 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-23 13:22:21 +00:00
ulion 5363464d0a Check boundary for queue's current_index.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25147 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-23 13:17:36 +00:00
diego 5de794723e Clarify playtree explanation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25146 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-23 12:01:13 +00:00
iive 958c41d9b6 Bring (de)muxer_lavf up to date with the libavformat API changes introduced by FFmpeg commit r11071.
Patch for demuxer_lavf.c by Chris Welton - electrostatic_1 at yahoo
Patch for muxer_lavf.c by me.
Approved by michaelni.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25145 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-23 10:44:33 +00:00
lu_zero 5b1720b92b Enable Theora support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25144 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-23 07:25:39 +00:00
ulion 70e7acda26 Prevent from using data->len when data is NULL (when play() return NULL).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25143 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-23 05:50:34 +00:00
ulion 4f1228ed5e Move the setCurrentTexture call into flip_page(), fix osd flicker problem.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25142 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-23 04:49:10 +00:00
diego a6f2e317f2 Fix half-baked last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25141 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-22 23:08:35 +00:00
nicodvb 98fe636509 don't include anymore the dvdread headers from the dvdnav directory
(the right ones are included in the #else). Patch by Rathann


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25140 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-22 22:41:08 +00:00
diego 01d988f011 Remove ! operator hack, we require a POSIX-compatible-shell.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25139 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-22 17:11:38 +00:00
diego 330f7ff8eb Invert the logic to check the cmp return value cmp to avoid using the ! operator.
Useful on non-POSIX shells that do not support the ! operator.  We normally
require a POSIX-compatible shell, but in this case the change is acceptable
since it does not complicate configure nor hurt readability.
patch by Ralf Menzel, menzel ls6.cs.uni-dortmund de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25138 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-22 16:46:48 +00:00
diego 27fa018d05 comment spelling/grammar fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25137 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-22 10:27:58 +00:00