1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Commit Graph

32415 Commits

Author SHA1 Message Date
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
reimar
3ea62a9666 cosmetics: remove some #if 0 code from mplayer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32468 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar
4590600a42 vo_dxr3: Fix validity checks before closing a file descriptor
-1 is invalid (and the initial value), 0 is not.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32467 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar
26108aa19a vo_dxr3: Fix indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32466 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar
ffb69180bb vidix: Simplify code for writing to /proc/mtrr
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32462 b3059339-0415-0410-9bf9-f77b7e298cf2

Add a missing const to declaration.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32463 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar
8fe2291c53 vo_mga: minor code cleanup
Spelling fix.

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

Use FFALIGN macro.

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

Spelling fix.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32461 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar
57300e6ec7 vo_xmga: Remove an unmotivated and pointless panscan_calc call
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32458 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar
41657da91e vo_xvidix: reconfigure also on window move
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32457 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar
79f6a2c868 vo_xmga: fix event handling
Fix xmga event handling: Reconfigure hardware on move and resize,
redraw colorkey on resize and expose.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32456 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar
69d173dfbb vo_xmga: Remove a useless MGA_VID_CONFIG ioctl
set_window already does this.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32455 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar
fef7b17c34 x11_common: add VO_EVENT_MOVE
Add VO_EVENT_MOVE which is required for VOs that interact directly
with hardware like MGA and VIDIX.

Patch by Dirk Porezag [porezag yahoo com]

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32454 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar
107845e9db vo_mga: switch to newer screen dimension handling API
Switch (x)mga vo to new libvo API to reduce code duplication and improve
consistency between vos.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32453 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar
deba9f3d2b aspect.c: use fallback if screen dimensions are not known
Add fallback values to aspect_save_screenres to avoid division by 0
if screen dimensions are not known.

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

Fix handling of invalid values in aspect_save_screenres to not overwrite
valid values.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32481 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
diego
8b271d49ec ao_coreaudio: byteswap AC-3 streams on little-endian
patch by Sean McGovern, gseanmcg gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32450 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
diego
374eb4f188 DOCS/man: Add missing values for the chanlist suboption of -tv
patch by Giorgio Vazzana, mywing81 gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32447 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
cehoyos
2158f1b401 demux_ts: fix subtitle stream breaking audio track switch
Fix switching audio track with the native MPEG-TS demuxer after an
additional subtitle stream was detected.

Patch by KS Ng, hk D dmbth A gmail

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32445 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
abca2a253e configure: Ensure that CONFIG_NETWORK is #defined to 0 or 1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32441 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
compn
d6a143acc1 codecs.conf: add another xdcam mpeg2 fourcc/isom xd54
Also mark ffwmvp as requiring lavf demuxer.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32440 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
reimar
c310aa4628 demux_lavf: handle new streams appearing during playback
Based on patch by KS Ng - dmbth [hk.dmbth gmail com]

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32439 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
reimar
db90a65d11 Remove remaining %lf printf conversions
Most cases are just code in comments.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32438 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
cehoyos
ee77268087 vf_yadif: modify asm to make compile with clang
Explicit wordlength for compare. Fixes compile with clang.

Patch by İsmail Dönmez, ismail namtrac org

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32437 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
7acaf6db39 demux_pva: move functions, add "static"
Mark pva_get_payload() as static, it is not used outside of the file.

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

Move pva_get_payload() around to avoid a forward declaration.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32436 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
342c68283e mpeg_hdr.c: move function to avoid forward declaration
Move mp_unescape03 function around to avoid forward declaration.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32433 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
03dae530f8 demux_real.c: Remove unused hexdump() forward declaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32432 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
1de42d8c64 demux_[mpg|ts|ty]: #include dec_audio.h for skip_audio_frame()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32431 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
448a8a4032 configure: simplify X11, IVTV and V4l2 checks
Simplify some X11 checks with the help of statement_check_broken().

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

Remove some unnecessary #includes from IVTV and V4L2 checks.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32429 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
0f583d3f61 mplayer.c: remove some obsolete commented-out lines
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32427 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
690bcb7b2c libvo: remove UNUSED() macros
Remove UNUSED macros used to shut up unused function parameter warnings.
The macros are duplicated all over libvo and serve no useful purpose
nowadays.  A better way to shut up the warnings is -Wno-unused-parameter.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32422 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
69e3e06a1a Move code to avoid forward declarations in top-level .c files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32421 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
cehoyos
b44a0edd9f subreader.c: malloc+memset -> calloc
Patch by Clément Bœsch, ubitux gmail

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32417 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
cehoyos
ed065aa6a8 subreader.c: Simplify comparison
Patch by Clément Bœsch, ubitux gmail

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32416 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
reimar
2b01fc0678 spudec: support "clear" packet type
Support "clear" packets that contain no data but instead clear the
screen at a given time.

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

Reindent.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32411 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
b4c7efdfe1 m_config.c: cosmetics: Move functions to avoid forward declarations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32387 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
cce06f6f21 m_config.[ch]: mark some function parameters const
patch by Clément Bœsch, ubitux gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32386 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
426235c2f9 libfaad2: cosmetics: Make local_changes.diff apply cleanly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32384 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
671de0948b configure: simplify some checks
Simplify some configure checks through statement_check{_broken}().

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

Drop two unnecessary Xlib.h #includes and use helper functions.

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

Revert accidentally committed changes.

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

Remove unnecessary Xlib.h #include from xf86keysym check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32390 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
3b51e2ff55 configure: Rename function_check{_broken}() --> statement_check{_broken}()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32379 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
d835d7890a configure: simplify some tests
Remove some unnecessary windows.h #includes in configure checks.

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

configure: simplify Direct3D and Windows waveout tests

Simplify Direct3D check with header_check().

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

Simplify Windows waveout test with header_check_broken().

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

Simplify ENCA check.

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

Remove unnecessary linux/types.h #include from Apple IR check.

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

Simplify jpeglib check with header_check_broken().

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

Simplify inet_pton/inet_aton checks with function_check().

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

Remove unnecessary sys/types.h #include from shm check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32378 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
2ff81f766c configure: update documentation comments about adding checks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32367 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
Gabrov
993f99fc2e DOCS/xml/hu: synced with r32361
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32362 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
cehoyos
408f435e91 codecs.conf: Partial support for ffwmvp (only works with -demuxer lavf)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32359 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00