1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-07 22:57:42 +00:00
Commit Graph

31737 Commits

Author SHA1 Message Date
cehoyos
0fd8d985f0 Silence permanent warning messages when decoding H264 over rtsp with
live555.

Patch by Gil Pedersen, gil A cmi D aau D dk 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31128 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-02 10:47:40 +00:00
reimar
fa6239aea0 Also print OpenGL renderer string with vendor and version with -v
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31127 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-01 22:49:05 +00:00
reimar
11b178be9a Continue probing even for score == AVPROBE_SCORE_MAX / 4 to match
FFmpeg's behaviour.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31111 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-01 15:38:37 +00:00
reimar
dd8db7f620 Use av_probe_input_format2 and avoid accepting detection
while the score is still low.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31110 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-01 13:50:49 +00:00
reimar
aca523bf78 Revert accidental change to default CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31109 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-30 21:18:17 +00:00
reimar
39fbfa0321 Add configure detection for SDL backend for -vo gl.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31108 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-30 19:04:13 +00:00
reimar
9d3c096045 Avoid duplicating the GL/gl.h include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31107 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-30 19:03:13 +00:00
reimar
ce4d38385c 100l, open the customtex also in binary mode, not just the program.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31106 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-30 17:12:52 +00:00
Uoti Urpala
035611f0a7 demux_y4m: fix failure with nonseekable input
Playback of nonseekable y4m streams was broken by a change merged from
svn, r30970 which added support for multiple yuv4mpeg files
concatenated together. The change included a stream_skip(stream, -1)
call which only works for seekable files. Work around this by
disabling the concatenated-file check for nonseekable streams. This
means concatenated files are only supported if the stream is seekable,
but this is an improvement compared to the svn commit which caused a
regression making _all_ files fail in the nonseekable case.

It would be reasonably easy to make the concatenation support work in
all cases, either by modifying demux_y4m or (probably better) adding a
general stream API to allow pushing back the read byte. However for
now I'm only fixing the regression with the above trivial change.
2010-04-30 20:07:38 +03:00
cehoyos
992e2d666f Fix compilation with gcc 2.95.3 (with --disable-ass).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31105 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-28 11:57:09 +00:00
iive
3517a9b72b New hack for vobsub packet merging.
It seems that if there is no padding between packets then they actually belong to one subtitle picture.
The new hack seems to work far more reliable than the (already removed) old one.
Patch by Ubitux (gmail)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31104 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-27 22:06:29 +00:00
reimar
46f3b7d263 Move variable declaration into the block where it is actually used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31103 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-27 19:04:23 +00:00
diego
eca4b87376 Add llrintf test for FFmpeg.
patch by Michael Kostylev, michael.kostylev gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31102 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-27 17:50:50 +00:00
diego
f15a14c158 Add missing input.h #include, fixes the warnings:
libvo/video_out.c:461: warning: implicit declaration of function 'mp_input_queue_cmd'
libvo/video_out.c:461: warning: implicit declaration of function 'mp_input_parse_cmd'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31101 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-27 15:17:49 +00:00
diego
04d20b550d Move "screen" variable declaration below the relevant #ifdef, fixes the warning:
libvo/x11_common.c:369: warning: unused variable 'screen'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31100 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-27 15:16:42 +00:00
Gabrov
c5a3a6d35d fix typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31099 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-27 13:33:29 +00:00
cehoyos
727f4b2b8a Fix compilation with live555 after libavutil r22965.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31098 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-27 08:19:42 +00:00
Uoti Urpala
f38efd166e Merge svn changes up to r31097 2010-04-26 19:23:32 +03:00
Uoti Urpala
7a33e76943 Skip svn changes r30151, r30152
The functionality equivalent was already done last month in git
(plus the svn commit has a misleading MSGL_WARN message that shouldn't
be there).
2010-04-26 18:51:02 +03:00
Uoti Urpala
9a34ae4fd0 Merge svn changes up to r31050 2010-04-26 18:46:18 +03:00
Uoti Urpala
8df340271e Merge svn changes up to r31040 2010-04-26 18:38:11 +03:00
Uoti Urpala
b4c7b7ce11 Skip svn change r31034 (bad FFmpeg-ASS support attempt)
This svn commit is wrong in multiple ways. First, it doesn't actually
work; there's more than one functionality bug. Second, it's the wrong
overall approach. If FFmpeg continues to insist on mangling subtitles
to this badly-thought-out format and support for it is desired in
MPlayer then the right approach would be conversion to a saner format
in demux_lavf, instead of trying to handle the mangled format
elsewhere.
2010-04-26 18:36:16 +03:00
Uoti Urpala
7795726e0f Merge svn changes up to r31033 2010-04-26 18:25:34 +03:00
Uoti Urpala
ba3b65b92f Skip svn changes up to r31022 2010-04-26 18:06:49 +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
be935e2766 Ignore svn changes up to r30974
FFmpeg build stuff.
2010-04-26 17:45:07 +03:00
Uoti Urpala
6a7956a11b Merge svn changes up to r30972 2010-04-26 17:44:48 +03:00
Uoti Urpala
e6048e1830 Skip svn change r30968
Already done long ago in git.
2010-04-26 17:43:35 +03:00
Uoti Urpala
4785c2617e Merge svn changes up to r30967 2010-04-26 17:42:20 +03:00
Uoti Urpala
2732d5efba Skip svn change r30918 2010-04-26 17:13:37 +03:00
Uoti Urpala
95fba94860 Merge svn changes up to r30917 2010-04-26 17:11:04 +03:00
Uoti Urpala
3c2d6d9a8e Merge svn change r30908 2010-04-26 17:00:52 +03:00
Uoti Urpala
ff559b8e90 Merge svn changes up to r30907 2010-04-26 16:57:25 +03:00
Uoti Urpala
d2e25a90c4 core: track current chapter for relative chapter seeks
Due to inexact seeks, chapter seek commands may result in a playback
position that's inside the previous chapter. This causes problems when
the user does repeated next-chapter/previous-chapter seeks, because
the code will use the wrong base for calculating 'next' or
'previous'. Improve the behavior by adding a heuristic that keeps
track of what chapter the user last wanted to seek to and adjusts the
"current chapter" value based on that.
2010-04-25 23:29:46 +03:00
Gabrov
4e853e19ef synced with r31096
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31097 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 20:05:22 +00:00
Uoti Urpala
823b989f0f mplayer.c: silence some compiler warnings
No semantic changes.
2010-04-25 23:05:01 +03:00
Uoti Urpala
082287f3a3 cfg-mplayer.h: add casts to silence warnings 2010-04-25 23:00:19 +03:00
Gabrov
c9c728034e typo fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31096 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 19:58:43 +00:00
Uoti Urpala
66a983985d mplayer.h: remove unnecessary declarations (dvd_device, cdrom_device) 2010-04-25 22:58:35 +03:00
Uoti Urpala
b1372a4f56 cosmetics: mark sub.c:osd_update_ext() static 2010-04-25 22:57:49 +03:00
Uoti Urpala
0b6e3647a5 commands: finish seeks before processing other commands
The code processing seek commands only sets/alters variables
specifying the current seek target. Before all queued commands were
processed first, and any needed seeks were executed after that. This
was somewhat unreliable, as commands queued later were not guaranteed
to see all the effects of earlier seek commands if they happened to be
processed in the same batch. Change the behavior so that processing
commands is interrupted and the real seek executed if the next command
is anything other than a basic seek. This guarantees that other
commands see a consistent state, while still allowing the combining of
consecutive seeks (which is useful for example when the user keeps the
seek-forward key pressed down, and key repeat is faster than seeks can
be executed).
2010-04-25 22:48:40 +03:00
Uoti Urpala
4cb23ad350 input: remove unused "paused" arguments from some functions 2010-04-25 22:48:18 +03:00
Uoti Urpala
1393793cd3 menu.h: add struct tag declaration to avoid warnings 2010-04-25 22:48:10 +03:00
Uoti Urpala
05ae9dbd0d Fix chapter handling with first chapter not at beginning of file
Before "-chapter 1" did nothing even if the first chapter didn't start
at the beginning of file. Fix it.
Before all chapter property commands (including chapter seek keys)
failed if the current playback position was before the start of the
first chapter. Now they'll work. Relative chapter seeks will go to the
first chapter (even if that's in the wrong direction for backward
seeks).
2010-04-25 22:48:10 +03:00
Uoti Urpala
dd1760e697 demux_mkv: fix verbose output of chapter numbering
The "Chapter N from..." lines printed with -v used wrong N.
2010-04-25 22:48:10 +03:00
Uoti Urpala
859e956523 Fix -chapter with ordered chapters
Move the code doing an initial seek specified by -chapter to a
position where it works if ordered chapters are used.
2010-04-25 22:48:10 +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
9c63c084ff mplayer.c: share seek-reset code with chapter seeks
Move code resetting various things after a seek into a separate
function and use that for chapter seeks too. In most cases this won't
change behavior because chapter seeks were already falling back to the
same time-based seek code.
2010-04-25 22:47:32 +03:00
reimar
7da954855a Set vo_dwidth/vo_dheight for mouse movements work at least in windowed mode.
For fullscreen, vo_screenwidth/vo_screenheight have to be set correctly still.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31095 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 16:48:48 +00:00