1
mirror of https://github.com/mpv-player/mpv synced 2024-11-18 21:16:10 +01:00
Commit Graph

29821 Commits

Author SHA1 Message Date
ptt
2781bab3af various little aesthetic fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29762 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-08 16:42:56 +00:00
diego
2df6aba009 Fix 100l typo introduced in last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29761 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-08 11:32:17 +00:00
ptt
6aef595f93 synced with r28576
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29760 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-08 11:31:24 +00:00
diego
50f563f927 cosmetics: Remove some pointless parentheses from return calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29759 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-08 11:25:01 +00:00
diego
77bc2b34b7 cosmetics: Break two more lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29758 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-08 10:48:12 +00:00
ptt
04ba27ba95 Updated to help_mp-en.h r29742
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29757 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-08 10:18:19 +00:00
diego
ad4e739ffa Clarify screenshot filter description.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29756 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-06 12:38:06 +00:00
diego
95e061d93b K&R coding style and whitespace cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29755 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-06 08:45:20 +00:00
adrian
28f36c3656 Add keycode definitions for older versions of OSX. Fixes compilation on 10.4.
Patch by Aaro Koskinen, aaro D koskinen A iki D fi


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29754 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-06 08:21:52 +00:00
reimar
07c11742a9 Remove many uses of tmp_run.
Checking that installed header and library match is not really our task,
also if desired it would be more correct to do it at runtime (e.g. because
of distributed binaries, or system updates gone wrong, ...).
tmp_run also slows down configure on systems with slow fork like MinGW.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29753 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-06 06:43:00 +00:00
attila
cbbc886820 add a warning to the description of -vf screenshot to add it after
all other filters that should apply to it
(fix PEBCAK as seen on #mplayer)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29752 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-05 12:40:34 +00:00
cehoyos
94229a8420 Play TrueHD in BluRay with demuxer lavf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29751 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-05 08:41:45 +00:00
cladisch
59b6e1393d fix calculation of ao_data.bps for sample formats with more than 16 bits
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29750 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-05 07:42:02 +00:00
cehoyos
23235a0ed0 Fix definition of KEY_PAGE_DOWN.
Patch by Aaro Koskinen, aaro D koskinen A iki D fi 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29749 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-04 21:10:13 +00:00
reimar
a79706df46 Make the ao_alsa play function always process a multiple of ao_data.outburst
except for the last chunk.
Should fix high CPU usage reported e.g. here: http://bugs.gentoo.org/show_bug.cgi?id=286020


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29748 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-02 16:49:41 +00:00
reimar
2946fb53a7 Add EXTERN_ASM define needed by FFmpeg on ARM.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29747 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-02 08:58:29 +00:00
jrash
e259900901 sync with en/mplayer.1 r29731
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29746 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-01 05:41:47 +00:00
compn
5b829ed07a updates
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29745 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-01 00:07:02 +00:00
diego
f806e745e2 Mark some functions that do not need external visibility as static.
patch by Alexander Neumann, alexander bumpern de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29744 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 23:47:00 +00:00
reimar
a04087cd67 Extend EBX_AVAILABLE check in a way that works for both OpenBSD/Haiku
and 64 bit OSX.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29743 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 18:45:02 +00:00
diego
4b3525f79f Reduce console output verbosity: Move colorspace information to verbose mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29742 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 14:55:43 +00:00
reimar
1ad332f8a5 lavf: if seeking in the desired direction failed, also try in the opposite one,
otherwise we might end up at some random position (where lavf last ended
up while trying to build the index).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29741 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 08:19:49 +00:00
reimar
70cdf76c6a Avoid void * arithmetic.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29740 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:54:04 +00:00
reimar
0b8508274c Simplify aac_get_sample_rate_index
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29739 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:52:37 +00:00
reimar
640d819512 Check for grow_array allocation failure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29738 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:48:01 +00:00
reimar
62a3efebf2 Avoid a possible crash if num_cluster_pos is 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29737 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:45:10 +00:00
reimar
eb5571e57e Check for integer overflow in grow_array.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29736 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:41:00 +00:00
reimar
aa576e8fc0 Rearrange code of grow_array to make it easier to extend.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29735 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:35:33 +00:00
reimar
f6f8acc19a Avoid a memleak if realloc fails in grow_array.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29734 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:33:05 +00:00
reimar
d1b5f6efa1 Change grow_array argument from void ** to void *, this avoids a aliasing
violation (thus making gcc 4.4.x compile the code correctly) and allows to get
rid of some casts at the expense of making the code less clear.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29733 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:27:43 +00:00
reimar
6fa7e2d867 Make -nosub work to disable subtitles even if -slang and dvd streams are used.
This still needs some additional checking that subtitle selection via dvdnav works.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29732 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-29 06:44:10 +00:00
reimar
55cd87882c Document -nosub option
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29731 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-28 11:33:40 +00:00
reimar
e3625bd232 Add a -nosub option that allows disabling auto-selected subtitles as e.g. the
mkv demuxer supports.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29730 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-28 11:32:27 +00:00
reimar
76cc7886d8 Allow -1 and -2 values for -aid, -vid and -sid (meaning "auto" and "disabled" respectively).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29729 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-28 11:31:25 +00:00
reimar
f43cc7c3cc Enable loading of external subtitles also for audio-only files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29728 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-28 11:26:19 +00:00
reimar
95d60aa019 Use a_pos to update subtitle for audio-only files instead of mpctx->sh_audio->pts
which e.g. for mp3 in AVI never has a useful value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29727 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-28 11:24:13 +00:00
reimar
df0cef80f9 Call set_osd_subtitle also for external subs (i.e. in find_subs).
This does not yet seem to work for audio-only files, subtitles seem
not to be loaded then.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29726 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-28 11:10:11 +00:00
cehoyos
556cda2071 Intel compiler icc 11.1 supports compilation of internal mp3lib and internal liba52.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29725 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-27 21:25:56 +00:00
cehoyos
205a377349 Cosmetics: Fix whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29724 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-27 19:22:48 +00:00
reimar
a531e51297 Set sensible write frequency/priority values for AllocateMemoryMESA
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29723 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-27 14:33:45 +00:00
reimar
f78f32c864 Print error instead of crashing when mesa-buffer is used on systems
that do not support it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29722 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-27 14:31:35 +00:00
reimar
fe3b9a88ce Also check GLX client and server strings for extensions
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29721 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-27 14:24:15 +00:00
reimar
a5abf5851c Amend previous commit: both zlib decoder and encoder must be disabled
if zlib is not available.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29720 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-26 21:22:01 +00:00
reimar
08073d325a Disable libavcodec zlib decoder when zlib is not available, fixes compilation
in that case.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29719 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-26 21:09:29 +00:00
reimar
09e4467756 Change libaf control ordering to make the controls unique again, (AF_CONTROL_PAN_BALANCE vs.
AF_CONTROL_PLAYBACK_SPEED), put them in-order again and add a bit of padding in-between.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29718 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-26 06:41:09 +00:00
reimar
ac8b90aec1 Do not override host_arch in x86 vs. x86_64 detection if it was forced via --target.
Patch by Andrew Wason [rectalogic rectalogic com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29717 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-25 16:46:39 +00:00
reimar
3f9cacf5d5 Change type to avoid void * arithmetic.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29716 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-25 09:44:41 +00:00
reimar
101d331f62 Set codec_type and codec_id in codec context for lavc encoders.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29715 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-25 09:43:59 +00:00
diego
e3b68c2745 Sync with current FFmpeg HEAD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29714 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-24 10:09:14 +00:00
diego
76141a5727 sync with FFmpeg build: BUILD_STATIC --> CONFIG_STATIC
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29713 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-24 09:47:36 +00:00