1
mirror of https://github.com/mpv-player/mpv synced 2024-11-03 03:19:24 +01:00
Commit Graph

32455 Commits

Author SHA1 Message Date
diego
d783c38ce1 mplayer.desktop: Add video/3gpp and application/x-flash-video mime types
patch extracted from the ALT Linux patch set

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32574 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:03:35 +02:00
diego
dbc9a080f4 configure: Do not enable rpath on NetBSD
patch extracted from the NetBSD pkgsrc tree

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32573 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:03:35 +02:00
diego
e4230c554c configure: Enable joystick support on FreeBSD
patch extracted from the FreeBSD ports tree

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32572 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:03:35 +02:00
cehoyos
0a2d29a75b codecs.conf, mp_taglists: Support FFmpeg LATM decoding
Also move libfaad codecs.conf entry into the same position as in svn
(no functionality change since ffaac is marked buggy so only faad is
used by default regardless or order).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32571 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:03:27 +02:00
komh
ffbc561f96 vo_kva: Restore all the attributes after changing aspect ratio
kvaSetup() resets all the attributes, so there is need to restore them.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32570 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-07 21:49:51 +02:00
komh
163ae34e96 vo_kva: Prevent a parent window from painting over ours in slave mode
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32569 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-07 21:49:10 +02:00
reimar
0142db087b vo_directx: Fix possible out-of-bounds access
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32568 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-07 21:48:37 +02:00
jrash
d067f6a2a0 DOCS/man/zh_CH: sync with en/mplayer.1 rev. 32566
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32567 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-07 21:48:16 +02:00
siretart
c1515ae3aa TOOLS/binary_codecs.sh: make indentation consistent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32561 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-07 21:47:32 +02:00
reimar
f94717cdc4 cache, stream: avoid extra memcpy when using cache
Add a stream_read_internal() function that reads directly into a given
buffer instead of the stream's internal one. Use this to read directly
into cache memory, avoiding a memcpy(). This requires also adding a
stream_seek_internal() as the normal seek function reads into the
stream's buffer.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32559 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-07 21:46:22 +02:00
reimar
c6fb4e2aa2 cosmetics: cache2.c: Remove some irrelevant commented-out code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32555 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-07 21:45:41 +02:00
cigaes
00f82c63b0 stream_dvd: millisecond accuracy for chapters in -identify output
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32539 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-07 20:18:21 +02:00
Uoti Urpala
759231566a demux_lavf: for avi, use packet .dts instead of .pts
When playing avi files take timestamps from the .dts field of the
packet instead of .pts. For avi libavformat returns the original avi
timestamps in .dts; without GENPTS set .pts is sometimes unset, with
GENPTS set it'll contain some made up values which are not correct
pts. Current libavformat also has a bug take makes it loop over the
whole avi file if you use GENPTS with video streams disabled.

The timing code can cope with the avi timestamps even though they're
not really pts.
2010-11-06 23:29:45 +02:00
Uoti Urpala
d707da9e65 build: enable vf_geq if libavutil version installs eval.h
New enough libavutil versions allow building vf_geq.c without
requiring internal FFmpeg headers.
2010-11-06 23:29:07 +02:00
Uoti Urpala
b04c615959 demux_lavf: avoid deprecated "first_iformat" by using newer API 2010-11-06 23:29:07 +02:00
Uoti Urpala
393bb7bb98 demux_lavf: add hack for stream-changing ogg input (internet radio)
Some internet radio streams are ogg/vorbis with a new stream for each
track (and the previous stream stops receiving data). Add a hack to
ignore the stream number in packets when input seems to match this
case; all packets will be effectively regarded as parts of the same
audio stream. This workaround can't work perfectly with current lavf
because it will keep adding streams and then hit its 20 stream
maximum; at that point playback will likely fail. Print a warning
about this problem and mention "-demuxer ogg" as a possible
workaround.

Currently there's no check that the vorbis extradata is actually
compatible between the streams.
2010-11-06 23:29:00 +02:00
Uoti Urpala
661d909f8e demux_lavf: more future proof AVInputFormat name comparison
AVInputFormat name fields consist of comma-separated components, more
of which may be added in backwards-compatible versions. demux_lavf did
a strcmp against the whole field at once; this would break if a
component was added. Change the code to search for individual
component matches within the field instead.
2010-11-06 23:26:21 +02:00
Uoti Urpala
348332af3a ffmpeg_files/taglists.c: update to latest FFmpeg values (r25209) 2010-11-05 10:33:59 +02:00
Clément Bœsch
a3124a4f5d options: add OPT_MAKE_FLAGS macro, creates "opt/noopt" flag pair 2010-11-04 06:44:12 +02:00
Clément Bœsch
952f9b85a7 options: move -name and -title to option struct 2010-11-04 05:54:12 +02:00
Uoti Urpala
be95d4c131 Makefile: enable .DELETE_ON_ERROR special target
msgfmt creates the output file even if there was a fatal error. Thus
make would stop because of the error return, but the output file would
be left on disk and running make again would continue building other
files. Enable the .DELETE_ON_ERROR special target to automatically
delete target files changed by failing commands. This affects all
rules; I think it is the correct behavior for all existing rules.
2010-11-04 01:30:42 +02:00
Uoti Urpala
34454cfcd1 Makefile: remove generated locale files in clean target 2010-11-04 00:42:46 +02:00
reimar
c69e262a62 vf_stereo3d: Add stereo3d filter
Further review very welcome, but it is time (and good enough) to add this.

Patch by Gordon Schmidt [gordon.schmidt s2000.tu-chemnitz de] with
changes by Endre Kollár [taxy443 gmail com].

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32527 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 07:48:40 +02:00
reimar
64ab2402e2 vd_ffmpeg: improve aspect ratio handling
Respect container aspect first if available, but change to ratio based
on video codec level information if there's a resolution or pixel
aspect change from the original codec values in the middle of the
video.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32525 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 07:48:40 +02:00
Uoti Urpala
3cb3bbbddc Add a simple capture feature (-capture)
If a specified key is pressed during playback, the current stream is
captured to a file, similar to what -dumpstream achieves.

original patch by Pásztor Szilárd, don tricon hu

Taken from the following svn commits, but with several fixes and
modifications (one obvious user-visible difference is that the default
key binding is 'C', not 'c'):

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32524 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32529 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32530 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 07:48:31 +02:00
Uoti Urpala
2be10f22b2 options: move -dumpfile to option struct 2010-11-02 04:18:38 +02:00
diego
4aa55a7725 configure: Fix detection of mips processor variants
patch by Graham Gower, graham.gower gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32522 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:38 +02:00
attila
fb8a99a81b manpage: Make commas and backslashes show properly
patch by Rudolf Polzer (divVerent)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32519 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:38 +02:00
cigaes
bc347d88cc options: modify parse_timestring(), make public
Make the parse_timestring public, with a slightly extended API.
As a consequence, "2 hours" is no longer recognized as a valid timestamp
meaning "2 seconds".

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32514 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:38 +02:00
cigaes
ce9fcc0730 vo_gl: Move the read_pnm function into a separate file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32513 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
reimar
c640b92bdd ao_sun: Add support for AOPLAY_FINAL_CHUNK
Reportedly this also fixes a possible hang at the end of playback
(shouldn't happen unless delay reporting is broken too).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32509 b3059339-0415-0410-9bf9-f77b7e298cf2

Reindent.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32510 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
reimar
56d122a6db stream_network: Fix possible crash for invalid http_proxy URLs
Check for URLs like just "http_proxy://".

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32508 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
reimar
f733870f32 subreader: More strict autodetection of RT subtitle format
Patch by Clément Bœsch [ubitux gmail com].

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32507 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
reimar
dbd5feedd5 new slave command: af_cmdline, for changing audio filter options
Add experimental af_cmdline slave command to allow changing filter
options at runtime.

Patch by Adrian Stutz [adrian sttz ch]

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32505 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
reimar
3452e2e907 libaf: Make af_reinit "public", to allow using it in future patches
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32504 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
reimar
14e4bb7d70 command.c: Add windows.h include to fix compilation in some cases
Patch by Gianluigi Tiesi [sherpya netfarm it]

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32500 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
reimar
650e8147c1 input: try to open "-input -file=" file even if stat() fails
Do not fail opening a -input file= file just because stat failed, but try
to call "open" in any case.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32497 b3059339-0415-0410-9bf9-f77b7e298cf2

Make code clearer by putting the "special case hack" inside the if.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32499 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
reimar
c1287003c0 rtsp_rtp.c: Add missing avstring include for av_strlcpy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32496 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
siretart
1f97094c8d configure: check if libdvdcss has been removed from tree
In some scenarios it might make sense to redistribute a copy of the
mplayer sources that does not contain the internal libdvdcss copy. In
order to not require the configure parameter
--disable-libdvdcss-internal, this change checks that the libdvdcss
directory actually exists when no particular behavior has been
requested.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32493 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
cigaes
aa1ac341fc cosmetics: remove some useless braces from command.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32492 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
Uoti Urpala
fe8a695f83 command.c: use different field in property table for integer data
The video equalizer properties plus tv_* and teletext_* ones use a
single function to handle multiple properties, with data in the struct
m_option "prop" argument indicating which property is being
handled. They all use integer data for that, but stored it in the
"priv" field of the struct which has type "void *". This caused
warnings and is not standard C (it's not guaranteed that you can cast
an arbitrary integer to "void *' and back - it'd work in the _other_
direction with intptr_t if that type exists).

Change the code to store the data in the "offset" field of the prop
struct instead. The name is not optimal for the way the functions use
it (except for gamma), but it'll do. (An alternative would be to store
a pointer in the priv field as in "(void *)&(const int){123}", but
that's somewhat ugly - the explicit (void *) cast is needed to avoid a
qualifier warning unless make it non-const data).
2010-11-02 04:18:37 +02:00
Uoti Urpala
3a1f89810f TOOLS/matroska.py: stop cleanly at EOF of complete file when parsing
When using the script to parse a Matroska file, the script used to
exit with an exception at EOF. Change it to exit quietly instead if
the file was parsed successfully. Keep showing an exception if EOF is
encountered in the middle of an element (truncated file).
2010-11-02 04:18:37 +02:00
Uoti Urpala
49096c7ae2 TOOLS/matroska.py: change to python3 syntax 2010-11-02 04:18:37 +02:00
reimar
f06d0009ff rtsp_rtp.c: Replace snprintf by av_strlcpy
Patch by Frédéric Marchal [fmarchal perso be].

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32487 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
reimar
b9ab864eec vd_qtvideo: fix crash on OS X with QuickTime
Do not call Setup_FS_Segment if the QuickTime framework is used on OSX
for decoding, even if the loader code is compiled in.
There is no point in it and since Setup_LDT_Keeper is not called before
it will actually crash on OSX due to the auto-alloc functionality not
being initialized and thus it will try to set fs to 0xffffffff.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32486 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
siretart
79347eaedb TOOLS/binary_codecs.sh: avoid creating fake "bestsites"
Do not create a fake 'bestsites' if neither 'fping' nor 'netselect' is
installed.

change developed by A Mennucc <mennucc1 [at] debian [dot] org>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32485 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
siretart
b1f187eb48 TOOLS/binary_codecs.sh: fix obsolete dpkg syntax
Use 'dpkg --print-architecture', the option
--print-installation-architecture is deprecated.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32484 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
diego
34e211820d cosmetics: Remove some obsolete and misleading comments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32482 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
diego
ed8e92afcc Remove #warning preprocessor directives
The #warning preprocessor directive is non-standard and not available with all
compilers. Furthermore, the warnings it causes are noisy and have not led to
getting any of the underlying issues fixed in the space of a decade.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32480 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:10 +02:00
reimar
2865993869 vo_gl: Extract code to read a pnm file into a separate function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32479 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00