c783e58e91
Using nl_langinfo in the asf mmst implementation makes no sense since
...
MPlayer does not use setlocale.
Just default to UTF-8 as input charset until there is a better solution.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29333 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-31 13:09:48 +00:00
6e9cbdc104
whitespace cosmetics: Remove all trailing whitespace.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
1db1773ec2
Merge svn changes up to r29277
2009-05-08 23:50:26 +03:00
4567425051
Reemit the ID_AID_x_LANG for the track. This allows the identification of the
...
audio track by language code (en or es) rather than by ID (128 or 129).
patch by Kevin DeKorte, kdekorte gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29170 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-11 13:51:02 +00:00
b6225fc8ae
Make tvi_v4l2 print -1 as "Current input" if the ioctl to read it failed.
...
Previously it printed (number of inputs + 1) which is needlessly confusing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29161 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-10 10:13:41 +00:00
486ce51625
Add a -indentify message that indicates if the current DVDNAV title is
...
a menu or a video.
Patch by Kevin DeKorte [kdekorte gmail com], approved by Nico.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29156 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-09 14:23:09 +00:00
d136cf6882
Merge svn changes up to r29134
2009-04-02 23:55:13 +03:00
a38ca08ca0
Remove unused variable along with the related warning.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29122 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-01 16:27:03 +00:00
cf9edda1d3
Merge svn changes up to r29117
2009-04-01 02:43:47 +03:00
f5d01796a8
100l, revert r29082, I missed that the vts comparison should be case-insensitive.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29084 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-28 16:09:56 +00:00
8d376de96f
Reindent
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29083 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-28 15:54:08 +00:00
df1af70475
Simplify extracting title number from ifo name
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29082 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-28 15:53:32 +00:00
8198495234
Simplify detection of .ifo extension.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29078 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-27 21:26:26 +00:00
09d4f18010
change close to closesocket, unifies close streaming code
...
patch by Francesco Cosoleto , cosoleto gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29066 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-26 13:35:12 +00:00
127480e660
Add support for mmsh:// as alias for mmshttp://
...
Patch by Francesco Cosoleto [cosoleto gmail com]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29064 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-26 11:00:04 +00:00
b397b28b31
Add TVI_CONTROL_VID_SET_WIDTH_HEIGHT to set width and height together for v4l2,
...
otherwise some drivers will always stay stuck in the lowest resolution.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28975 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-16 17:12:29 +00:00
37c6f0d36c
100l fix calculation of dropped frames, number of frames is time * fps, not time / fps.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28962 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 16:12:05 +00:00
ae2faad666
Merge svn changes up to r28951
2009-03-14 23:52:45 +02:00
540847db7b
Ensure the string we're trying to compare is actually not NULL.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28920 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 20:31:03 +00:00
571c0fb8a9
The first valid index is total count - 1 (usually 0)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28919 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 20:30:24 +00:00
0c6f667896
Merge svn changes up to r28755
2009-02-28 05:58:59 +02:00
8605d7090e
Use memset to make sure all parts of struct sockaddr_in are always initialized.
...
Problem reported by [kmkaplan+mplayer-dev-eng (at) kim kim-minh com]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28732 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-25 12:51:20 +00:00
66f6f9f076
Merge svn changes up to r28712
2009-02-23 21:00:52 +02:00
ee50536b74
Accept DVB API 5, patch by Steven Brudenell, steven.brudenell gmail com.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28702 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-22 14:12:33 +00:00
186e5a998c
Merge svn changes up to r28641
...
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
2009-02-18 01:45:36 +02:00
1b915e419e
Replace double semicolon by single semicolon.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 02:00:29 +00:00
9790f4e6e7
Merge svn changes up to r28461
2009-02-04 00:28:17 +02:00
7e1662839a
Restructure network tests: Always check for both inet_aton and inet_pton.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28439 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 14:38:28 +00:00
0f65d3be9d
Convert HAVE_WINSOCK2_H into a 0/1 definition.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28437 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 13:42:27 +00:00
3b222d68b0
HAVE_ATON --> HAVE_INET_ATON to match FFmpeg and give it a 0/1 value.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28435 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 13:33:35 +00:00
be5f5c7046
Convert HAVE_CLOSESOCKET and HAVE_SOCKLEN_T into 0/1 definitions.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28434 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 13:16:46 +00:00
dd888b05ff
Merge svn changes up to r28366
...
Contains more changes needed to sync build system with latest FFmpeg.
Conflicts:
Makefile
configure
mplayer.c
2009-01-26 00:58:15 +02:00
84fbeecf72
Fix a NULL-check that used && instead of || and thus could not avoid crashes.
...
Patch by Luis Felipe Strano Moraes (luis strano gmail com).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28354 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-25 18:23:05 +00:00
9bcd12fdf5
Merge svn changes up to r28310
...
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
2009-01-15 05:57:31 +02:00
4af9bf7e02
Switch internal dvdread to libdvdread SVN external.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28280 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-08 19:28:28 +00:00
824abb5a65
Add missing 'void' keyword to parameterless function declarations.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 14:48:03 +00:00
82d097d04b
Fix DVD seek_to_chapter: the title number must be converted to a per-VTS
...
title number first. Also add a few out-of-bounds checks just in case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28226 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-01 11:46:34 +00:00
a2c2268cdf
Work around a dvdread bug where DVDReadBlocks would return values < 0 on read error,
...
causing hangs e.g. when seeking to the very last chapter (which would read beyond the
size of the DVD).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28216 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-31 14:21:50 +00:00
c1b80dcbbb
Merge svn changes up to r28204
2008-12-27 17:40:57 +02:00
47044eb841
Avoid u_ BSD type names.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28197 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-27 12:03:51 +00:00
a3ab9e8e46
Merge svn changes up to r28149
2008-12-14 17:28:16 +02:00
39090878e5
Replace informal GPL notes by standard GPL header.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28140 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-13 12:13:48 +00:00
8c144171bb
Merge svn changes up to r28087
...
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
2008-12-04 01:55:52 +02:00
0864f92e7a
Get rid of pointless 'extern' keywords.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
e62517ef6a
Merge svn changes up to r28065
2008-12-02 18:02:05 +02:00
bd7e915bf5
Move PTHREAD_CACHE define logic to configure.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28048 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-28 17:04:36 +00:00
1715c2a336
Merge svn changes up to r27949
...
Conflicts:
common.mak
libvo/vo_xv.c
libvo/x11_common.c
libvo/x11_common.h
stream/cache2.c
2008-11-17 20:50:23 +02:00
7ecf9a6d04
100l, stream->cache_pid can not be used directly in pthread_create,
...
it has the wrong type. Luckily we currently do not need the value anyway.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27930 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 19:43:39 +00:00
ca77ee41f0
Use pthreads for the cache on Cygwin, since _beginthread is not available
...
and the previous CreateThread method would probably leak memory here, too.
Also pthreads seems to be the official Cygwin threading API.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27928 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 19:08:50 +00:00
1f52c9ed8b
Include cache2.h in cache2.c, fixes an implicit declaration warning for cache_do_control
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27910 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-14 19:29:04 +00:00
reimar