1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-19 13:51:14 +00:00
Commit Graph

29564 Commits

Author SHA1 Message Date
diego
6720a0d0cd The libamrnb *en*coder, not the *de*coder should be added to the list of
encoders to enable in libavcodec.
patch by Wang William, william0wang gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29605 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 08:30:15 +00:00
reimar
efdf0e5fc7 Fix per-file config file loading for DOS paths (i.e. where \ and : can
also separate path and file name).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29604 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 10:07:44 +00:00
reimar
a0eda318e8 Factor out code to try and load a config file only if it exists.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29603 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 09:48:25 +00:00
reimar
1cd2feed03 Move variable declaration into block where it is used and make it const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29602 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 09:41:27 +00:00
reimar
7d0270087d Make m_config_parse_config_file file name argument const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29601 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 09:40:04 +00:00
cehoyos
5babf10d75 Fix MPEG-4 ASP in MPEG transport streams with -demuxer lavf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29600 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 09:35:56 +00:00
cehoyos
58794cf766 Fix EAC3 in MPEG transport streams with -demuxer lavf.
Patch by Wang William, william0wang gmail


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29599 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 09:09:00 +00:00
reimar
8eab1ca95c Also check linker flags to make sure that liveMedia libraries are there, too,
not just the headers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29598 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 09:00:37 +00:00
cehoyos
8593195592 Fix DTS in MPEG transport streams with -demuxer lavf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29597 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 08:42:36 +00:00
cehoyos
7a20e9060a Fix AAC in MPEG transport stream for -demuxer lavf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29596 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 08:31:12 +00:00
diego
aa16e6ca7d cosmetics: alphabetically order lists
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29595 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-31 05:21:12 +00:00
compn
7a6ab8a711 bpcm is internal mplayer fourcc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29594 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-30 23:28:38 +00:00
cehoyos
74f6a6ba52 Rename mp_wav_override_tag* as mp_codecid_override_tag* to reflect that
it now can be used for both audio and video.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29593 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-30 23:01:36 +00:00
cehoyos
ae6e3b9fc2 Revert r29404.
Playing H264 in ts files should now always work without this workaround.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29592 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-30 22:55:21 +00:00
cehoyos
1912561b1e Fix MPEG2 and H264 in MPEG transport stream with demuxer lavf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29591 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-30 22:52:47 +00:00
cehoyos
361bdec7ed Use mp_wav_override_taglists for both audio and video.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29590 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-30 22:51:52 +00:00
cehoyos
8d8aa1a4cf Fix MP2 and AC3 with demuxer lavf in MPEG transport streams.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29589 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-30 21:27:45 +00:00
cehoyos
97503eb4ee Support PCM in Bluray streams.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29588 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-30 21:14:42 +00:00
ramiro
c9a80aa682 Curly brackets cosmetics for previous commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29587 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-29 23:08:32 +00:00
ramiro
53f310c52c Check for return value of initFilter().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29586 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-29 23:06:22 +00:00
ramiro
db1c65dc6c Revert mistakenly commited hunk.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29585 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-29 23:03:14 +00:00
ramiro
7f0e696575 swscale: Check for return values of malloc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29584 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-29 23:02:01 +00:00
ramiro
289d5fc85e swscale-example: Free memory used by input data.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29583 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-29 03:36:09 +00:00
ramiro
52b42d8abc Restore comment that was partially removed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29582 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-29 02:44:03 +00:00
jrash
4e7d46109e Synced with help_mp-en.h r29549
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29581 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-29 00:25:14 +00:00
jrash
1d09cab464 sync with en/mplayer.1 r29555
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29580 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-29 00:04:43 +00:00
reimar
311db2c468 Port feature from corevideo: remember half/double size settings and reapply
them after an aspect change.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29579 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 14:39:42 +00:00
reimar
b7c7318352 Make aspect switching work again (used the wrong variable and always
switched to the original aspect).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29578 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 14:38:44 +00:00
reimar
cc1b58e348 Fix implicit declaration of mp_input_.. functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29577 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 14:02:32 +00:00
reimar
6497662b92 1l, use sizeof for snprintf size instead of hard-coding the current value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29576 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 13:30:32 +00:00
reimar
fde99e3c5d Reuse the osx_common convert_key function to convert OSX keycodes to MPlayer
keycodes instead of its own switch-case in vo_corevideo.m


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29575 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 13:29:07 +00:00
reimar
4ce7a48748 Move aspect change handling from vo_quartz to osx_common.
This could probably be even moved to video_out, though the names should
be improved.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29574 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 13:25:30 +00:00
reimar
0dadcc7bf0 Add osx_common.c and move the keycode conversion (OSX to MPlayer) there.
Also get rid of our own defines for the keycodes and instead use the
predefined ones from Carbon.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29573 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 12:54:33 +00:00
reimar
1ba0432474 Use the standard MPlayer aspect handling instead of reimplementing our own in vo_quartz.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29572 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 08:36:51 +00:00
reimar
6901602578 Remove unused movie_aspect extern declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29571 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 23:40:36 +00:00
reimar
a4566be905 Use lookup_keymap_table function with data structure instead of huge switch-case
for mapping OSX keys onto MPlayer keys in vo_quartz.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29570 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 23:13:37 +00:00
reimar
435a7803d0 Enable calc_src_dst_rects for windowed aspect and panscan.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29569 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 19:13:19 +00:00
reimar
8082e89f6e Remove panscan related conditions and code that only breaks future windowed
aspect and panscan without any real benefit.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29568 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 18:51:02 +00:00
reimar
f6e58b8a99 Make gl2 code capable of windowed aspect and panscan (no user option to enable it yet though).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29567 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 18:42:08 +00:00
reimar
6765091bfa Add infrastructure and test code to enable aspect scaling and panscan in windowed mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29566 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 18:36:51 +00:00
reimar
26d8e6a696 Fix video placement with -vo gl2 -fs -wid.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29565 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 14:12:38 +00:00
reimar
f10dcbacd5 -vo gl2 resize does not need to modify its arguments, so pass int instead of int *.
In particular, this avoids modifying vo_dwidth/vo_dheight which should only
be modified by the "windowing layer" (w32_common, x11_common).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29564 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 14:10:38 +00:00
reimar
c3067ee82f Simplify -vo gl ass border etc. dimension calculation one bit more.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29563 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 14:07:15 +00:00
reimar
c2edb80335 Remove useless code that has no effect.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29562 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 14:01:39 +00:00
reimar
082c7b9446 Simplify and fix ass border calculations for -vo gl and -wid -fs mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29561 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 13:54:53 +00:00
reimar
6ec672e3cc Make panscan cover the same range in -wid -fs mode as in normal mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29560 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 13:31:12 +00:00
reimar
16c2a6660a Disable -keepaspect with -wid in w32_common code.
This does not work in a useful way and was unintentionally "enabled"
when -wid was made to use a separate window.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29559 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 13:20:21 +00:00
reimar
e18b64611c Fix aspect_fit to work correctly when borders need to be added on top and
bottom, previous code accidentally compared against screen dimensions,
resulting in cropping instead of added borders.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29558 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 12:38:22 +00:00
reimar
4cbff98bad Forgotten changes to aspect code to handle -wid with -fs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29557 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 12:35:23 +00:00
reimar
e8429f1f5b First attempts at supporting -fs with -wid, -vo gl on X11 only so far
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29556 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 12:03:02 +00:00