1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-04 05:52:09 +00:00
Commit Graph

29778 Commits

Author SHA1 Message Date
diego
37677802e5 Fix bashism: Use '$(( ))' syntax instead of '(( ))' for arithmetic expressions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29669 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-10 18:29:34 +00:00
reimar
86ff541253 Add w64 to list of preferred lavf formats (otherwise demux_audio incorrectly
claims the Wave64 files but can not handle them).
Patch by Daniel Verkamp [daniel drv nu].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29668 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-10 17:30:02 +00:00
reimar
cd5fa27550 Sort preferred_list alphabetically since the order does not matter otherwise.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29667 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-10 17:28:35 +00:00
reimar
d5d5bbbb35 Always keep a backup of the expand values from the command-line, so values
will be recalculated correctly e.g. after aspect change and -vf expand=aspect=4/3
command line.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29666 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-10 16:49:20 +00:00
ramiro
927afdcf6d Document that slices can be bottom to top or top to bottom.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29665 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-09 21:43:25 +00:00
reimar
873d120347 Add CODEC_ID_ADPCM_IMA_AMV to lavf codec_tag override list instead of
reimplementing that functionality.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29664 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 21:45:36 +00:00
reimar
1ea5135f6f Make all mp_*_taglists const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29663 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 21:42:51 +00:00
cehoyos
f443f004c9 Allow disabling and enabling lower-case codecs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29662 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 16:32:21 +00:00
diego
08ea2ad8fe Make (no)t23 suboption description more consistent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29661 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 09:27:48 +00:00
reimar
64c5127103 Fix an endless loop if all programs are empty.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29660 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 09:08:05 +00:00
reimar
03f08ab010 Make indentation consistent with the rest of the file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29659 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 09:07:23 +00:00
reimar
055b0cc5d8 Never switch to a program with no audio and no video.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29658 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 09:06:43 +00:00
reimar
b05f2d0bdf Always register all streams from libavformat, not just those belonging to a program.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29657 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 08:55:05 +00:00
reimar
f49f430159 100l, forgot to use "test" for checking the value of the quicktime variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29656 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 08:50:03 +00:00
vitor
9d99f5bd8d Add support for lavf vqf demuxer and lavc TwinVQ decoder.
Also make lavf the default demuxer for vqf.

Ok'ed by Compn on IRC.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29655 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-07 17:20:44 +00:00
ramiro
af8ff1be74 Indent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29654 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-07 16:29:32 +00:00
diego
b70a91d505 Avoid bash-specific 'let' syntax in shell scripts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29653 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-07 10:37:16 +00:00
ramiro
eb4187bb17 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
parameters.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29652 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-06 00:07:35 +00:00
ramiro
8e6405bb82 Indent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29651 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-05 23:35:59 +00:00
ramiro
6d1176f071 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
Patch by Lars Täuber <lars <dot> taeuber <at> gmx <dot> net>.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29650 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-05 23:33:11 +00:00
reimar
b3a789863e Add standard license header and move a misplaced comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29649 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-05 08:48:48 +00:00
jrash
5e54e3554e sync with en/mplayer.1 r29638
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29648 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-05 00:56:58 +00:00
diego
bd3ae0c9e6 Fix grammar mistake noticed by Alexander Strasser.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29647 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 19:02:12 +00:00
reimar
76d4cd713f Factor out duplicated code to set play video scaled by a certain factor.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29646 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 18:43:28 +00:00
reimar
5f76d2416b Subopt parser subopts should now be const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29645 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 18:21:28 +00:00
reimar
dcfd043ea8 10l, -framework QuickTime must be added to extra_ldflags, not libs_mplayer since
QuickTime is used also in mencoder (in the audio and video decoders and possibly
from demux_mov, even though the latter one should only use the includes and not
require linking).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29644 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 12:24:45 +00:00
reimar
a8580cbcf2 Disable liba52 SSE imdct for x86_64+PIC (e.g. OSX 64 bit) since it will
not compile for that combination.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29643 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 10:31:24 +00:00
reimar
8bac9079bf Support x86_64 + PIC in mangle.h, needed for OS X 64 bit compiles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29642 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 09:50:17 +00:00
reimar
0f4dfe16f8 Split QuickTime check off from quartz check and use the result to enable/disable
the QTX codec support.
This is necessary since 64 bit compiles on OS X 10.5 at least do not support QuickTime.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29641 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 09:35:58 +00:00
reimar
bceec9b4b2 100l, SIZE_MAX must be UINT_MAX to prevent an integer overflow later on,
also it is preferable if demuxer parsing does not differ between architectures.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29640 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 09:21:06 +00:00
reimar
4338a8d7f4 Move OpenGL test below CoreVideo. This ensures -lGL will come after -framework OpenGL which
resolves vo_corevideo crashes due to namespace conflicts (e.g. glEnable, glBegin, ...).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29639 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-04 07:57:06 +00:00
reimar
39ed8ed063 Improve wording for file/directory specific config file explanation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29638 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-03 06:59:14 +00:00
reimar
9600686eb5 10l, fix misplaced check in r29613, for loop detection we must compare
current file name against full name to be added, not current file name
against new base path.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29637 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 19:55:24 +00:00
reimar
76cb85c056 Limit amount of data allocated on stack, strlen(filename) is not a good idea for
file name strings that might come from arbitrary playlists, use PATH_MAX instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29636 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 19:49:10 +00:00
reimar
8eaac76141 Document directory-specific configuration file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29635 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 19:44:15 +00:00
reimar
7e8ff35fd2 Add support for directory-specific mplayer.conf configuration file.
Patch by Christian P. Schmidt "schmidt digadd de"


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29634 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 19:43:05 +00:00
faust3
758980965c enable ffwmapro
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29633 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 17:49:24 +00:00
reimar
d0c1992160 Consistently use sizeof(variable) instead of sizeof(type) where easily possible.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29632 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 14:18:01 +00:00
reimar
25cc492d90 Cosmetics: get rid of many pointless ()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29631 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 14:11:30 +00:00
reimar
7a7c246709 Reduce code duplication for half/normal/double video size handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29630 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 14:02:15 +00:00
reimar
001e4be0ba Remove unused variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29629 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 11:38:18 +00:00
reimar
790e41cf8f The suboption parser now takes a const options list, so mark them all const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29628 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 11:33:37 +00:00
reimar
46a0ddd36e free(), delete and delete[] are all different and can't just be used at random,
so change code to use the one appropriate for the allocation used.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29627 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 11:07:02 +00:00
reimar
d1e7b4dc6f Fix possible crashes with invalid SDPs that result in stream descriptions
not being initialized.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29626 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:55:36 +00:00
reimar
ac11b35a6a Fix several more rtsp-related memleaks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29625 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:44:26 +00:00
reimar
70a247b26d Fix asmrp_dispose to also free the buffer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29624 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:37:32 +00:00
reimar
2726fe03ec Use calloc to ensure rmff_new_mdpr returns fully initialized data.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29623 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:35:06 +00:00
reimar
3351bc2d18 Move variable declaration to where it is used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29622 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:28:08 +00:00
reimar
079a64ae8d Make sure we do not strdup(NULL), avoids a crash with non-real streams.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29621 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:22:08 +00:00
reimar
5c4a06530d Fix several memleaks in real_setup_and_get_header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29620 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:20:45 +00:00