summaryrefslogtreecommitdiffstats
path: root/stream
Commit message (Collapse)AuthorAgeFilesLines
* Replace libavutil internal header #includes with MPlayer copiesUoti Urpala2009-07-267-7/+7
| | | | | | Change #include lines for libavutil/intreadwrite.h, libavutil/bswap.h and libavutil/x86_cpu.h to use the MPlayer file under ffmpeg_files/ instead.
* Remove the internal GUIAnton Khirnov2009-07-071-4/+0
| | | | | | | | | The GUI is badly designed and too closely coupled to the internal details of other code. The GUI code is in bad shape and unmaintained for years. There is no indication that anyone would maintain it in the future either. Even if someone did volunteer to implement a better integrated GUI having the current code in the tree probably wouldn't help much. So get rid of it.
* Merge svn changes up to r29412Uoti Urpala2009-07-073-12/+6
|\
| * Replace incorrect use of strncpy by av_strlcpy.reimar2009-06-261-1/+2
| | | | | | | | | | | | | | Only a real issue if inet_ntoa can actually return a string of more than 255 bytes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29393 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Files should be opened in binary mode on OS/2.diego2009-06-031-3/+3
| | | | | | | | | | | | | | patch by KO Myung-Hun, komh chollian net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29346 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Using nl_langinfo in the asf mmst implementation makes no sense sincereimar2009-05-311-8/+1
| | | | | | | | | | | | | | | | 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
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-1380-966/+966
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-0781-973/+966
| |
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-0726-421/+434
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-0726-421/+421
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Merge svn changes up to r29277Uoti Urpala2009-05-082-5/+16
|\|
| * Reemit the ID_AID_x_LANG for the track. This allows the identification of thediego2009-04-111-3/+10
| | | | | | | | | | | | | | | | 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
| * Make tvi_v4l2 print -1 as "Current input" if the ioctl to read it failed.reimar2009-04-101-0/+1
| | | | | | | | | | | | | | 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
| * Add a -indentify message that indicates if the current DVDNAV title isreimar2009-04-091-2/+5
| | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r29134Uoti Urpala2009-04-021-1/+0
|\|
| * Remove unused variable along with the related warning.diego2009-04-011-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29122 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29117Uoti Urpala2009-04-015-6/+22
|\|
| * 100l, revert r29082, I missed that the vts comparison should be ↵reimar2009-03-281-1/+5
| | | | | | | | | | | | case-insensitive. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29084 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reindentreimar2009-03-281-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29083 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify extracting title number from ifo namereimar2009-03-281-5/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29082 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify detection of .ifo extension.reimar2009-03-271-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29078 b3059339-0415-0410-9bf9-f77b7e298cf2
| * change close to closesocket, unifies close streaming codecompn2009-03-261-1/+1
| | | | | | | | | | | | | | patch by Francesco Cosoleto , cosoleto gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29066 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for mmsh:// as alias for mmshttp://reimar2009-03-261-2/+3
| | | | | | | | | | | | | | Patch by Francesco Cosoleto [cosoleto gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29064 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add TVI_CONTROL_VID_SET_WIDTH_HEIGHT to set width and height together for v4l2,reimar2009-03-163-0/+15
| | | | | | | | | | | | | | 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
| * 100l fix calculation of dropped frames, number of frames is time * fps, not ↵reimar2009-03-151-1/+1
| | | | | | | | | | | | time / fps. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28962 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28951Uoti Urpala2009-03-142-2/+3
|\|
| * Ensure the string we're trying to compare is actually not NULL.ben2009-03-091-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28920 b3059339-0415-0410-9bf9-f77b7e298cf2
| * The first valid index is total count - 1 (usually 0)ben2009-03-091-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28919 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28755Uoti Urpala2009-02-282-0/+3
|\|
| * Use memset to make sure all parts of struct sockaddr_in are always initialized.reimar2009-02-252-0/+3
| | | | | | | | | | | | | | 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
* | Merge svn changes up to r28712Uoti Urpala2009-02-231-1/+8
|\|
| * Accept DVB API 5, patch by Steven Brudenell, steven.brudenell gmail com.diego2009-02-221-1/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28702 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28641Uoti Urpala2009-02-183-3/+3
|\| | | | | | | | | | | | | | | 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.
| * Replace double semicolon by single semicolon.diego2009-02-163-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28461Uoti Urpala2009-02-0419-64/+56
|\|
| * Restructure network tests: Always check for both inet_aton and inet_pton.diego2009-02-013-25/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28439 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Convert HAVE_WINSOCK2_H into a 0/1 definition.diego2009-02-0119-40/+40
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28437 b3059339-0415-0410-9bf9-f77b7e298cf2
| * HAVE_ATON --> HAVE_INET_ATON to match FFmpeg and give it a 0/1 value.diego2009-02-013-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28435 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Convert HAVE_CLOSESOCKET and HAVE_SOCKLEN_T into 0/1 definitions.diego2009-02-011-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28434 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28366Uoti Urpala2009-01-261-1/+1
|\| | | | | | | | | | | | | | | | | Contains more changes needed to sync build system with latest FFmpeg. Conflicts: Makefile configure mplayer.c
| * Fix a NULL-check that used && instead of || and thus could not avoid crashes.reimar2009-01-251-1/+1
| | | | | | | | | | | | | | 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
* | Merge svn changes up to r28310Uoti Urpala2009-01-155-17/+12
|\| | | | | | | | | | | | | | | 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.
| * Switch internal dvdread to libdvdread SVN external.reimar2009-01-083-15/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28280 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing 'void' keyword to parameterless function declarations.diego2009-01-051-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix DVD seek_to_chapter: the title number must be converted to a per-VTSreimar2009-01-011-0/+9
| | | | | | | | | | | | | | 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
| * Work around a dvdread bug where DVDReadBlocks would return values < 0 on ↵reimar2008-12-311-1/+2
| | | | | | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r28204Uoti Urpala2008-12-271-1/+1
|\|
| * Avoid u_ BSD type names.diego2008-12-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28197 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28149Uoti Urpala2008-12-141-15/+25
|\|
| * Replace informal GPL notes by standard GPL header.diego2008-12-131-15/+25
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28140 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28087Uoti Urpala2008-12-046-15/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Get rid of pointless 'extern' keywords.diego2008-12-036-15/+15
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28065Uoti Urpala2008-12-021-4/+0
|\|
| * Move PTHREAD_CACHE define logic to configure.reimar2008-11-281-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28048 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27949Uoti Urpala2008-11-171-12/+32
|\| | | | | | | | | | | | | | | | | Conflicts: common.mak libvo/vo_xv.c libvo/x11_common.c libvo/x11_common.h stream/cache2.c
| * 100l, stream->cache_pid can not be used directly in pthread_create,reimar2008-11-151-1/+5
| | | | | | | | | | | | | | 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
| * Use pthreads for the cache on Cygwin, since _beginthread is not availablereimar2008-11-151-11/+27
| | | | | | | | | | | | | | | | 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
| * Include cache2.h in cache2.c, fixes an implicit declaration warning for ↵reimar2008-11-141-0/+1
| | | | | | | | | | | | cache_do_control git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27910 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27899Uoti Urpala2008-11-065-6/+9
|\|
| * set to -1 fds that were closed; handle the sec_fd only if CONFIG_DVB_HEAD ↵nicodvb2008-11-052-3/+3
| | | | | | | | | | | | isn't defined; patch by Reimar git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27897 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Intialize unused fd variables to -1 (which is actually invalid) insteadreimar2008-11-041-1/+1
| | | | | | | | | | | | | | of 0 (which is stdin and can cause weird side-effects). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27893 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix condition broken in r27401 which incorrectly caused stdin to be closed ↵reimar2008-11-041-1/+1
| | | | | | | | | | | | after playing DVB. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27892 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Forgotten reindentreimar2008-11-021-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27882 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a noicyx:// protocol to allow easier testing for misconfigured servers.reimar2008-11-022-1/+2
| | | | | | | |