RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
31,720 Commits 41 Branches 85 Tags 133 MiB
Commit Graph

1030 Commits

Author SHA1 Message Date
Uoti Urpala 7795726e0f Merge svn changes up to r31033 2010-04-26 18:25:34 +03:00
Uoti Urpala 837c48ddee Merge svn changes up to r31020 2010-04-26 18:06:00 +03:00
Uoti Urpala e913d6c5da Merge svn changes up to r31004 2010-04-26 17:55:05 +03:00
Uoti Urpala 4785c2617e Merge svn changes up to r30967 2010-04-26 17:42:20 +03:00
Uoti Urpala a2133d7684 options: move -chapter values to option struct 
-chapter can optionally take a range with a start and an end. Add a
new option type which supports such values and use that instead of a
custom per-option function.

This commit also fixes a build configuration bug: before the
availability of the -chapter option depended on DVD functionality
being enabled in the binary, even though the option works with other
sources too.
 2010-04-25 22:48:10 +03:00
Uoti Urpala 7be5f14c3a demux_lavf, stream_ffmpeg: support librtmp seeks 2010-04-23 23:50:34 +03:00
Uoti Urpala 1d4d1bff82 stream_ffmpeg, demux_lavf: Use flv demuxer for rtmp streams 
Use lavf's flv demuxer for rtmp/rtmps/... stream types. Letting
generic format probing handle this could work, but with the current
probing implementation it'd at least depend on not-really-guaranteed
details of the stream layer (probing different formats and then
decoding depends on seeking back in between; rtmp streams don't
support such seeking directly so would need to rely on details of
caching behavior).
 2010-04-23 22:57:25 +03:00
Uoti Urpala eb48fefe94 stream_ffmpeg.c: change reads back to url_read_complete() 
Change reading data from FFmpeg from url_read() back to
url_read_complete(). url_read_complete() behavior has changed in
FFmpeg and no longer returns an error for partial reads at EOF so it's
usable now. Using it is probably not significantly better than
url_read(), but at least it handles EAGAIN.
 2010-04-23 21:19:50 +03:00
reimar 7e8bfbef4b Do not print the "Loading cookie file" message twice. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31024 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 19:35:35 +00:00
reimar d62bef6ee5 Try to fix VCD compilation on non-Linux systems. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31023 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 19:31:55 +00:00
reimar 9521c190c3 Export VCD tracks as chapters, just like for cue:// URLs. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31019 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 16:40:04 +00:00
diego c7cdd996f5 Remove commented-out #include of a non-existing file. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30992 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-03 14:40:08 +00:00
reimar fd6ce85192 Change type to uint8_t to avoid checks depending on char signedness. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30983 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-02 07:14:21 +00:00
reimar 006c481c1e Sanitize ICY metadata a bit before printing it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30980 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-31 19:42:15 +00:00
reimar f76e141402 Make http_read_response fail if parsing the response failed. 
Avoids possible crashes since other code assumes http_hdr->protocol
is a valid string if it succeeds.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30951 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-23 19:45:33 +00:00
diego 70c66c0476 Rename get_path.[ch] --> path.[ch]. 
These files now contain different functions related to path handling.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30943 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-20 23:38:27 +00:00
Uoti Urpala 00323c06e2 Delete things related to old translation system 
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
 2010-03-10 03:47:14 +02:00
Uoti Urpala 0269d22d32 Merge svn changes up to r30876 2010-03-10 03:18:42 +02:00
Uoti Urpala 240550bbb9 Merge svn changes up to r30848 2010-03-10 03:00:14 +02:00
Uoti Urpala 4857965118 Merge svn changes up to r30815 2010-03-10 02:36:35 +02:00
Uoti Urpala bc1d0ca37d Merge svn changes up to r30798 2010-03-10 02:35:02 +02:00
Uoti Urpala e74708f619 Merge svn changes up to r30748 2010-03-10 01:50:55 +02:00
Uoti Urpala acdce0176a Merge svn changes up to r30732 2010-03-10 01:25:15 +02:00
Uoti Urpala 194efde18f Merge svn changes up to r30702 2010-03-10 01:08:50 +02:00
Uoti Urpala 0dce155dd3 Merge svn changes up to r30694 2010-03-10 01:01:15 +02:00
Uoti Urpala 327463be52 Merge svn changes up to r30672 2010-03-10 00:34:16 +02:00
Uoti Urpala 13221a7165 Merge svn changes up to r30663 
Conflicts:
	gui/cfg.c
	libmpcodecs/vd_dmo.c
	mplayer.c
 2010-03-10 00:13:11 +02:00
Uoti Urpala 8e593f5a34 Merge svn changes up to r30529 2010-03-09 22:47:41 +02:00
Uoti Urpala bc0f524909 Merge svn changes up to r30502 
Conflicts:
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb.h
	libswscale/swscale.c
	libvo/x11_common.c
 2010-03-09 19:44:28 +02:00
Uoti Urpala 12d3caebc7 Merge svn changes up to r30475 2010-03-09 19:18:43 +02:00
Uoti Urpala b34a88e4f4 translations: tweak cases that relied on concatenating adjacent strings 
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.
 2010-03-07 21:35:23 +02:00
Uoti Urpala 5234c72e28 Restore collapsed whitespace in output messages 
For some reason commit e306174952, 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.
 2010-03-07 21:34:54 +02:00
komh dd491c0d28 Define O_BINARY in stream/stream.h unless it is defined yet, and use it 
in other places.

This removes platform specific checks and prevents repeated definitions
of O_BINARY.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30850 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-06 07:24:41 +00:00
komh b10a6917f4 Define HAVE_SETMODE conditionally, and use it in stream/stream_file.c instead 
of platform specific predefined macros.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30829 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-04 14:46:44 +00:00
komh 9beeeb1a9e Add a VCD support for OS/2 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30819 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-03 14:32:29 +00:00
diego c106fe7751 Drop support for old-style DVB code. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30818 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-02 19:57:17 +00:00
reimar be23797ee7 Remove unused and useless define. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30815 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 21:09:17 +00:00
reimar 3fa6717fb9 Fix memleak due to strdup'd filename not being freed. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30814 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 20:38:33 +00:00
reimar cd4aa2aa30 Move functions into proper order to avoid extra declarations. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30813 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 20:33:47 +00:00
reimar 3ed38bacc4 Deduplicate code to set stream start_pos/end_pos. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30812 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 20:31:56 +00:00
reimar 4b7c452ce8 Set stream->pos correctly after seeking to a VCD title. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30811 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 20:22:18 +00:00
reimar ea139fadc1 Ensure that cue_current_pos.track is not set to an invalid value after 
attempting to seek to e.g. track 0.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30810 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 20:20:13 +00:00
reimar 20fcc5c6ef Fix off-by-one error in chapter<->VCD track conversion. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30809 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 20:11:11 +00:00
reimar 4464a64ff7 Fix cue_read_toc_entry to also reject negative track numbers 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30808 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 20:07:37 +00:00
reimar 686565165f Implement cue:// track switching via chapter forward/backward like for audio CDs. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30807 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 19:59:54 +00:00
reimar 592af7cd2c Fix cue_vcd_get_track_end to not change the current position. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30806 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 19:57:42 +00:00
reimar f2740450d3 Avoid fd_bin and fd_cue global variables. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30805 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 19:35:18 +00:00
reimar 3fc8335a86 Avoid a global variable and a strcpy. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30804 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 19:25:52 +00:00
reimar 2b91c7f044 Reindent. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30803 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 19:21:59 +00:00
reimar 2a6755e10d Avoid code duplication and excessively deep nesting in cue_find_bin 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30802 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 19:20:32 +00:00