aboutsummaryrefslogtreecommitdiffhomepage
path: root/stream
Commit message (Collapse)AuthorAge
* Merge svn changes up to r30694Gravatar Uoti Urpala2010-03-10
|\
* \ Merge svn changes up to r30672Gravatar Uoti Urpala2010-03-10
|\ \
* \ \ Merge svn changes up to r30663Gravatar Uoti Urpala2010-03-10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gui/cfg.c libmpcodecs/vd_dmo.c mplayer.c
* \ \ \ Merge svn changes up to r30529Gravatar Uoti Urpala2010-03-09
|\ \ \ \
* \ \ \ \ Merge svn changes up to r30502Gravatar Uoti Urpala2010-03-09
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libswscale/rgb2rgb.c libswscale/rgb2rgb.h libswscale/swscale.c libvo/x11_common.c
* \ \ \ \ \ Merge svn changes up to r30475Gravatar Uoti Urpala2010-03-09
|\ \ \ \ \ \
* | | | | | | translations: tweak cases that relied on concatenating adjacent stringsGravatar Uoti Urpala2010-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweak some code parts that used to rely on string literals from translation macros being concatenated with other adjacent string literals. Break up the resulting string into independently translated parts, so that the existing translations for those parts can still be used.
* | | | | | | Restore collapsed whitespace in output messagesGravatar Uoti Urpala2010-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason commit e306174952d42e1cd6cc5efc50ae6bb0410501bc, which replaced translation macro names with the corresponding English strings, also collapsed multiple consecutive space characters into one. Change most of these back. In a couple of cases the amount of whitespace is important for alignment, and for the rest it at least keeps the strings closer to the existing translations.
| | | | | | * Declare stream_fill_buffer() and stream_seek_long() unconditionally.Gravatar diego2010-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are public functions that are unconditionally compiled, so they should not be declared conditionally. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30691 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * Add header for asf_mmst_streaming_start() instead of forward declaring it.Gravatar diego2010-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30690 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * Add header for exported DVB-related functions.Gravatar diego2010-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30688 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * cosmetics: Move functions around to avoid forward declarations and #ifdefs.Gravatar diego2010-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30687 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * cosmetics: Remove pointless empty lines at EOF.Gravatar diego2010-02-20
| | | | | |/ | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | * cosmetics: K&R coding style, indent with 4 spaces, no tabsGravatar diego2010-02-20
| | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30671 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | * Print response headers as debugging output also for HTTP seeks.Gravatar reimar2010-02-20
| | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30670 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | * 10l, fix a close() that should be a closesocket()Gravatar reimar2010-02-20
| | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30669 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | * Do not discard stream buffer on eof, instead reuse it to slightly improveGravatar reimar2010-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format autodetection with -nocache and non-seekable streams. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30668 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | * Replace misuse of stream_reset to set stream pos to 0 by more appropriate code.Gravatar reimar2010-02-20
| | | | |/ | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30667 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | * Fix mov reference files: for video/quicktime mime do not force a demuxerGravatar reimar2010-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but do autodetection. This tries lavf first but will also try native demuxer for reference files where open fails for the lavf demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30663 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | * Make sure we do not try to use IPv6 with winsock2, we end up connectingGravatar reimar2010-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to random addresses, causing huge delays. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30661 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | * Add dvd_parse_chapter_range() to stream_dvd.h instead of forward declaring it.Gravatar diego2010-02-19
| | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30657 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | * Add missing 'defined' for __bsdi__.Gravatar komh2010-02-19
| | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30655 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | * Remove pointless '#if 1' preprocessor directives.Gravatar diego2010-02-19
| | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | * Replace platform preprocessor check by HAVE_DOS_PATHS.Gravatar komh2010-02-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is both more elegant and more portable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30650 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | * Remove useless CONFIG_SETLOCALEGravatar komh2010-02-19
| | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30649 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | * stream: Mark functions not used outside of their files as static.Gravatar diego2010-02-16
| | | |/ | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30599 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Prefer libavformat over our own mov demuxer also for video/quicktimeGravatar reimar2010-02-05
| | |/ | | | | | | | | | | | | | | | | | | mime-type. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30517 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * ReindentGravatar reimar2010-02-03
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30499 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * Add support for FFmpeg's rtsp dummy URL-with-pseudo-demuxer scheme.Gravatar reimar2010-02-03
| | | | | | | | | | | | | | | | | | | | | ffmpeg://rtsp://... will play a rtsp stream via FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30498 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * Fix argument order for lseek, fixes cookie loading in Windows and in generalGravatar reimar2010-02-03
| |/ | | | | | | | | | | | | everywhere where SEEK_SET != 0. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30496 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add license header to all files missing it in the stream subdirectory.Gravatar diego2010-01-30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30468 b3059339-0415-0410-9bf9-f77b7e298cf2
| * stream/rtp.h appears not to originate from dvbstream.Gravatar diego2010-01-30
| | | | | | | | | | | | | | In any case it is completely trivial and non-copyrightable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30465 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30419Gravatar Uoti Urpala2010-01-25
|\|
* | Merge svn changes up to r30375Gravatar Uoti Urpala2010-01-25
|\ \
* \ \ Merge svn changes up to r30301Gravatar Uoti Urpala2010-01-25
|\ \ \
| | | * Fix ftp support to properly support large files > 2GB.Gravatar reimar2010-01-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch by Yuriy Kaminskiy [yumkam mail ru] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30418 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Always call cache_uninit to immediately free everything cache-related if weGravatar reimar2010-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fail to enable the cache. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30404 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Call cache-uninit unconditionally, it should always be safe to call.Gravatar reimar2010-01-23
| | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30403 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Change code to allow playing a stream even if enabling the cache failedGravatar reimar2010-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | while still handling it when the user aborts the cache fill. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30402 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Make cache_init static, it is not used outside this fileGravatar reimar2010-01-23
| | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30401 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Handle Content-Length also when Content-Type is not set.Gravatar reimar2010-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on patch by Yuriy Kaminskiy [yumkam mail ru] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30399 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Use atoll to parse Content-Length to support http for files > 2GB.Gravatar reimar2010-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch by Yuriy Kaminskiy [yumkam mail ru]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30398 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Add an exit() to silence a gcc warning and ensure forked code will neverGravatar reimar2010-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | leave the cache-loop function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30397 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * 100l, shouldn't write to memory after freeing it.Gravatar reimar2010-01-23
| | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30396 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Reindent.Gravatar reimar2010-01-23
| | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30395 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Zero freed pointers.Gravatar reimar2010-01-23
| | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30394 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Check for fork failing and make sure cache_uninit always frees the cache dataGravatar reimar2010-01-23
| | |/ | | | | | | | | | | | | | | | | | | even if fork failed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30393 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | stream: improve EOF handling in seeksGravatar Uoti Urpala2010-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset stream 'eof' flag when a seek succeeds, and allow seeking to a position at or past EOF (in the sense that the seek succeeds and stream_tell() then returns that position). This fixes at least some demuxer problems where an attempt to read the index from the end of an incomplete file would set the 'eof' flag and cause subsequent reads to fail, even if failure to read the index would otherwise be nonfatal and demuxing could continue after seeking back. Partially based on a patch from Laurent <laurent.aml@gmail.com>.
| | * Add hack to fix tvi_dshow compilation with 64-bit MinGWGravatar reimar2010-01-17
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30347 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * Change GUID declarations in tvi_dshow so they are not exported and thusGravatar reimar2010-01-17
| |/ | | | | | | | | | | | | will not cause clashes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30342 b3059339-0415-0410-9bf9-f77b7e298cf2