1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 18:12:22 +00:00
Commit Graph

32731 Commits

Author SHA1 Message Date
Uoti Urpala
17528080d6 Copyright, LICENSE: change binary license to GPL 3
Change license indicated for compiled binaries to GPL 3 to match
talloc.c which is LGPL 3+. Note that at least for now the source
licenses have NOT been changed - almost everything is still GPL 2+ or
compatible, not GPL 3+.
2011-03-24 23:40:29 +02:00
Uoti Urpala
85f4633796 demux_ty: disable -subcc functionality (demux_ty_osd)
Disable compilation of demux_ty_osd.c because of its GPL v2-only
license. This only affects TiVo files with -subcc. After this no
v2-only code should get compiled (yuv4mpeg_intern.h has a v2-only
license, but the contents of the header look like they're not
copyrightable).
2011-03-24 22:23:12 +02:00
Stefano Pigozzi
b10b2b5b2c vo_corevideo: add key_modifier_alt only when pressing left option key 2011-03-18 21:59:38 +02:00
Uoti Urpala
ea828cbb37 .gitignore: add /cpuinfo
Ignore the "cpuinfo" binary. The configure script can create that on
systems which lack /proc/cpuinfo or equivalent.
2011-03-13 22:20:51 +02:00
Stefano Pigozzi
e94a9076dc vo_corevideo: fix menubar showing 2 apples on snow leopard 2011-03-11 20:32:57 +02:00
Stefano Pigozzi
cf664986ae vo_corevideo: support modifier keys in keyboard input 2011-03-03 13:27:30 +02:00
Uoti Urpala
afef26425d core: hr-seek: fix soft hang with hrseek past EOF
When doing a precise seek video_out->frame_loaded was left to true
while frames were being skipped. However vo_get_buffered_frame()
always returns success if a frame is already loaded; due to this the
EOF detection in update_video() never triggered, and a hr-seek past
EOF could cause a soft hang (commands were still processed and it was
possible to seek again to exit the loop). This could also happen with
Matroska files using ordered chapters if an underlying file was
actually shorter than the chapter that was supposed to come from it.
Then seeking to a timestamp after the end of the file but before the
end of the chapter would trigger the bug.

Fix the problem by setting frame_loaded to false when we decide to
skip the frame in question.
2011-03-03 12:54:36 +02:00
Uoti Urpala
9f6b8e30d2 configure: remove --ffmpeg-source-dir help output
As things currently are the --ffmpeg-source-dir option will cause a
compilation failure. Maybe the video filters that depend on internal
FFmpeg headers to work should be deleted completely; for now I'll
remove the option from the help output as it can only confuse normal
users.
2011-03-01 23:56:41 +02:00
Uoti Urpala
b27e4ca371 libdvdcss: drop internal libdvdcss tree
The internal libdvdcss version was only compiled if you used internal
libdvdread too; and libdvdread was not included in the sources, so
that'd only happen if you manually added libdvdread in the build
tree. Keeping libdvdcss for that case probably isn't worth it, so
delete it from the tree. The build system part is still there, so an
internal build is possible if you add the directory back.
2011-03-01 22:37:15 +02:00
Uoti Urpala
e786c70de9 build: change version number generation
Force Makefile to always run version.sh to potentially regenerate
version.h. Drop compiler version and 'git-' prefix from version
number. Match only git tags starting 'v'+number when generating
version number; leave the 'v' out from the result.
2011-02-19 19:07:12 +02:00
Uoti Urpala
d9c79b7dc6 configure: fix --enable-libvorbis with tremor installed
Autodetected libvorbis prevented tremor test from running, but
--enable-libvorbis didn't. Add an explicit check to disable tremor in
that case.
2011-02-18 16:16:30 +02:00
Uoti Urpala
a3e92c22b2 .gitignore: add /po and /locale 2011-02-15 21:28:57 +02:00
Uoti Urpala
bb79b19817 terminal output: change program name to "MPlayer2" 2011-02-15 19:38:59 +02:00
cehoyos
8affafc2a8 codecs.conf: Add FFmpeg WC4 xan decoder
Patch by Philip Langdale, philipl overt org

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32875 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 19:30:57 +02:00
reimar
7781f23d68 demux_ts: change DVB SPU format for libavcodec
Change DVB SPU stream format in TS demuxer so it can be decoded by
libavcodec (as soon as lavc is fixed not to fail just because of an
extra padding byte).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32866 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 19:30:01 +02:00
reimar
9e2b74b073 subs: Print a message when lavc subtitle decoding fails
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32865 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 19:28:59 +02:00
reimar
7b49d6763a demux_ts: DVB and PGS subtitle fixes
Fix r32587: the previous approach to return subtitles in time broke
DVB subtitles due to returning incomplete packets and even for
PGS subtitles resulted in incorrect pts values for the sub packets.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32864 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 19:25:15 +02:00
faust3
676d5401f3 ad_qtaudio: fix use with the libavformat mov demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32863 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 19:23:52 +02:00
reimar
f04d70ace1 demux_ts: Set subtitle stream type correctly for DVB subtitles
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32862 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 19:23:43 +02:00
diego
30f9c5cd2b cleanup: remove some casts of memalign() return value
Do not pointlessly cast the return value of memalign().
memalign() returns void*, which is compatible with any pointer in C.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32850 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 19:20:37 +02:00
compn
8aac9fae9b codecs.conf: add apco, ap4h, ai55, ai15 fourccs
add apco and ap4h fourcc to prores decoder
add ai55 and ai15 fourcc to h264 docoders

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32843 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 19:16:49 +02:00
cboesch
d037ba7331 vd_mpng: libpng API update, use color type getter
Use color type getter instead of direct access to private member.

Using the getter is mandatory since recent libpng 1.5 release.

Patch by Gianluigi Tiesi (mplayer - netfarm it)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32840 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 19:14:34 +02:00
michael
a353f11132 libmpcodecs/vf_*.c: Replace memalign() by av_malloc()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32834 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix postprocessing and perspective filters on x86-64
(missing libavutil/mem.h include).

Original patch by Reinhard Tartler

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32835 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 19:12:50 +02:00
reimar
005bbf0da4 stream/url.c: escape characters >= 127 in URLs
Escape character values >= 127 in URLs as required by the RFC.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32833 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 18:47:55 +02:00
reimar
851bb3ce82 demux_asf: add sanity check
Check that rlen is valid before using it to increment a pointer.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32832 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 18:47:03 +02:00
reimar
179cb785e9 configure: disable libmpcdec by default
Disable libmpcdec (musepack) support by default, FFmpeg has a decoder
that works better for us and is used by default.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32826 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 18:46:17 +02:00
Uoti Urpala
f7d8bba686 cleanup: mplayer.c: clean up pause_loop() a bit 2011-02-15 18:38:43 +02:00
reimar
ba3dab4639 terminal output: show cache fill changes in "PAUSED" message
Convert cache_fill_status into a function so we always get the latest
state, not whatever it was after the last read.

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

Update PAUSED status line with cache fill status if it changed.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32819 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 18:35:34 +02:00
Uoti Urpala
398643d0d7 configure: remove unused maemo check
configure had a check for some libraries specific to the maemo
platform. Apparently the code which would have used the results of
this check was never added. Remove the unused check.
2011-02-15 16:42:55 +02:00
Uoti Urpala
ac443f6fd5 configure: use LINGUAS environment variable for messages
Previously the default with --enable-translation was to install all
language files if --language-msg was not explicitly specified. Change
the default to the languages set with the --language option or LINGUAS
environment variable if those are set; if neither is set then the
default is still to install all message languages.
2011-02-15 16:33:27 +02:00
Uoti Urpala
685bbb5734 DOCS/xml/en: remove various outdated documentation
The XML documentation was badly outdated, with various obsolete,
useless and and sometimes actively harmful advice. Delete a lot of the
obsolete stuff, without spending much effort to replace it for now.

In the FAQ section I removed some questions completely; in other cases
I only removed the answer if I thought the entry might be worth
keeping but the answer would need to be updated.
2011-02-15 12:08:16 +02:00
Uoti Urpala
0321f6ce3c documentation: remove Changelog, rewrite README
The Changelog and README files were badly out of date. Remove
Changelog and replace README with a new minimal one.
2011-02-15 12:04:32 +02:00
Uoti Urpala
b7e2899655 configure: abort if FFmpeg libraries are not found
Abort if FFmpeg libraries are not found unless --disable-ffmpeg was
explicitly specified. Note that even if you disable FFmpeg, libavutil
and libswscale are still required and you'll need to add linker flags
for them manually; I didn't try to clean up that case (few people
will want to do that).

Also fix the fallback test used if pkg-config doesn't find the
libraries: fix wrong header name and drop forced -lavcore which isn't
present in all FFmpeg versions. This shouldn't make a difference for
normal use since the pkg-config test should succeed if the libraries
are available.
2011-02-08 19:07:17 +02:00
Uoti Urpala
e1a8392cae fix compilation with old FFmpeg versions
af_lavcac3enc: use old SampleFormat names without AV_ prefix, the
latter were only added in 2010-11

vd_ffmpeg: add ifdef around CODEC_ID_LAGARITH use

demux_real: use ffmpeg_files/intreadwrite.h

stream/http.c, stream/realrtsp/real.c: define AV_BASE64_SIZE macro for
old libavutil versions lacking it
2011-02-08 19:07:10 +02:00
Uoti Urpala
cba6d60bcd ffmpeg_files/taglists.c: add new FFmpeg values
Updated to last FFmpeg svn version values (r26400).
2011-02-05 03:38:50 +02:00
Uoti Urpala
1f1ef44dd1 input: accept Shift modifier for Enter and Tab keys
Enter and Tab are the only named keys (rather than identified by the
printable character they produce) with code below 256. Add a special
case to recognize the Shift modifier with them.
2011-02-05 02:16:17 +02:00
Uoti Urpala
7f576e8b66 input: remove incorrect "CTRL" keyname alias for backspace
The keycodes.h file contains a KEY_CTRL define, then various control
keys expressed as "KEY_CTRL + 0" and so on. Back in 2002 when the key
name table in input.c was created this KEY_CTRL define was mistakenly
interpreted as a key name, apparently confusing it with the Ctrl key
(even though the input system didn't handle that key back then). As a
result there was an incorrect key name entry with the same key code as
backspace and name "CTRL". This incorrect entry was used when printing
the name of the key. Delete it.
2011-02-05 02:13:58 +02:00
Uoti Urpala
106c5f9989 x11_common: fix for reconfig with pos/xineramascreen set
vo_x11_create_vo_window() only called vo_x11_update_geometry() if no
window position had been specified by -geometry or -xineramascreen, to
avoid overwriting the specified position with values from the existing
window. However window size should be initialized to the existing
window here, and setting new window title for -use-filename-title is
also done in vo_x11_update_geometry() (for whatever reason, it doesn't
match what else that function does). Change the code in
vo_x11_create_vo_window() to always call vo_x11_update_geometry() for
size variable and window title updates, but add a flag that tells it
not to update position variables.
2011-02-03 21:49:12 +02:00
Uoti Urpala
c24d4e9ec2 af_lavcac3enc: fix for lavc AC-3 encoder change to float input
The libavcodec AC-3 encoder was changed to use floats, and take
floating point samples as input (the fixed-point version is still
available under the new name "ac3_fixed"). This broke af_lavcac3enc
because it blindly assumed without checking that the "ac3" encoder
would take signed 16-bit integer samples. Improve af_lavcac3enc so
that it checks the sample formats supported by the encoder and can
handle either int16_t or float.

Perhaps an option to keep using integer input but instead switch the
encoder name to "ac3_fixed" for new libavcodec versions would have
some value. Then again, maybe not. Using the preferred data format of
the default "ac3" encoder should normally be best, so probably better
not add such an option unless real need appears.
2011-02-03 04:55:20 +02:00
Uoti Urpala
0cb63ea722 ad_ffmpeg: add missing extradata padding
One of two alternative code parts passing codec extradata to
libavcodec didn't add the buffer padding that libavcodec requires,
resulting in invalid reads beoynd allocated memory area. Fix.
2011-02-02 09:13:14 +02:00
Uoti Urpala
dbb47bb2ec configure: print "Unknown parameter: " error to stderr
Print the "Unknown parameter: " line shown for unrecognized configure
options to stderr; other fatal errors are already directed there.
2011-02-02 02:18:51 +02:00
Uoti Urpala
ed575cb710 configure: drop unused liblzo and bzlib tests
The configure liblzo test was left over from MEncoder functionality,
bzlib from internal FFmpeg build. Remove both.
2011-02-02 00:18:16 +02:00
Uoti Urpala
3bf725c39f configure: prefer libvorbis to libvorbisidec/tremor
libvorbis and libvorbisidec cannot both be enabled at the same time.
Change configure to enable libvorbis by default if both are
available. It's the more common library, and if someone want to do a
special build for FPU-less systems he can select the library
manually.
2011-02-01 21:30:53 +02:00
Uoti Urpala
6122d83981 tremor: drop internal tremor library
Drop internal copy of the tremor library. Note that the internal ogg
demuxer (which is still sometimes useful to work around libavformat
ogg demuxer problems, though it's itself quite buggy) now cannot be
compiled without either external libvorbis or libvorbisidec (tremor).
2011-02-01 21:28:03 +02:00
Uoti Urpala
7cd7416c73 libmpeg2: drop libmpeg2 support
libavcodec mpeg2 decoder has been the default for a while and seems to
work fine.
2011-02-01 20:10:27 +02:00
Uoti Urpala
156ba34ac7 Copyright: delete removed library copies from list 2011-02-01 04:42:37 +02:00
Uoti Urpala
5db34ebd93 terminal output: change infamous "Core dumped" message
The "Core dumped ;)" message printed after finishing a stream dump is
known to confuse users but was kept as "humor". Change it to say
"Stream dump complete." instead.
2011-02-01 04:30:02 +02:00
Uoti Urpala
ebce4808fc manpage: remove BUGS section, misc fixes
About the only useful part of the BUGS section on the manpage was a
link to mplayerhq.hu, and that doesn't really apply any more (includes
references to Subversion etc). Remove that section and update/remove
some outdated info.
2011-02-01 04:22:11 +02:00
Uoti Urpala
fad3585ef4 options: remove CONF_OLD option flag
The resulting semantics of this flag are weird enough that they're
unlikely to be what is wanted in any situation. Remove the flag and
convert the two options using it, -screenw and -screenh, to use
CONF_NOSAVE instead. I'm not sure why those specific options had the
flag and if any flag is really needed, but I don't want to check in
detail now and using CONF_NOSAVE should keep about the same behavior
in practice.

A bit more detail about the weird behavior this flag had:

When not using file groups, the flag had the same behavior as
CONF_NOSAVE, namely that when switching files the option would not be
reset to the global value (only possible file-specific settings were
applied). When using file groups, group-specific options would apply
to the _first two_ files in the group, but for the rest after the
first two, settings would not be reset when changing files (wtf?).
This was a result of the following sequence:
1) push higher-level settings, enter group
2) apply group-specific settings
3) push settings before applying ones specific to file 1 in group
4) apply file 1 settings, play file 1
5) pop settings to return to group settings
6) push settings before applying ones specific to file 2
7) apply file 2 settings
8) pop settings

Here the option was set at 2). 3) saved it because it had been set
after last push, so 5) restored the setting and it was used for file 2
too. However 6) no longer saved it because there had been pushes after
the original setting in 2), thus 8) no longer restored the setting and
the option was no longer forced to any particular value when playing
further files after that.
2011-01-31 21:53:05 +02:00
Uoti Urpala
4ea60a3d0e options: mark -fs with CONF_NOSAVE to keep state between files
Most of the time users want to keep current fullscreen state when
switching to another file, rather than always resetting to the global
default that was determined when the command line was parsed. Add the
CONF_NOSAVE flag to the -fs option to achieve this. The change means
that the fullscreen state from the previous file is kept unless there
is an explicit file-specific -fs or -nofs setting for the new file
(or in case file groups are used, moving to the new file enters a
group with explicitly specified state).
2011-01-31 21:15:59 +02:00