diff options
57 files changed, 323 insertions, 1598 deletions
diff --git a/.gitignore b/.gitignore index a3cff725c0..45b6ab2b9b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ /config.h /config.mak /config.log -/mplayer +/mpv /version.h /codecs.conf.h /input/input_conf.h @@ -20,5 +20,5 @@ /libmpdemux/ebml_types.h /libvo/vdpau_template.c /sub/osd_font.h -DOCS/man/*/mplayer.1 +DOCS/man/*/mpv.1 @@ -1,3 +1,6 @@ +mpv is a fork of mplayer2, which is a fork of MPlayer. +Original MPlayer Copyright file follows below. + MPlayer was originally written by Árpád Gereöffy and has been extended and worked on by many more since then, see the AUTHORS file for an (incomplete) list. MPlayer as a whole is copyrighted by the MPlayer team. Individual diff --git a/DOCS/encoding.rst b/DOCS/encoding.rst index 67ad19bae6..84b1007afd 100644 --- a/DOCS/encoding.rst +++ b/DOCS/encoding.rst @@ -3,15 +3,15 @@ General usage :: - mplayer infile -o outfile [-of outfileformat] [-ofopts formatoptions] \ + mpv infile -o outfile [-of outfileformat] [-ofopts formatoptions] \ [-ofps outfps | -oautofps] [-oharddup] [-ocopyts | -orawts] [-oneverdrop] \ - [(any other mplayer options)] \ + [(any other mpv options)] \ -ovc outvideocodec [-ovcopts outvideocodecoptions] \ -oac outaudiocodec [-oacopts outaudiocodecoptions] Help for these options is provided if giving help as parameter, as in:: - mplayer -ovc help + mpv -ovc help The suboptions of these generally are identical to ffmpeg's (as option parsing is simply delegated to ffmpeg). The option -ocopyts enables copying timestamps @@ -25,7 +25,7 @@ from the input video. Note that not all codecs and not all formats support VFR encoding, and some which do have bugs when a target bitrate is specified - use -ofps or -oautofps to force CFR encoding in these cases. -Of course, the options can be stored in a profile, like this .mplayer/config +Of course, the options can be stored in a profile, like this .mpv/config section:: [myencprofile] @@ -40,7 +40,7 @@ section:: One can then encode using this profile using the command:: - mplayer infile -o outfile.mp4 -profile myencprofile + mpv infile -o outfile.mp4 -profile myencprofile Some example profiles are provided in a file etc/encoding-example-profiles.conf; as for this, see below. @@ -54,7 +54,7 @@ for. Typical MPEG-4 Part 2 ("ASP", "DivX") encoding, AVI container:: - mplayer infile -o outfile.avi \ + mpv infile -o outfile.avi \ -ofps 25 \ -ovc mpeg4 -ovcopts qscale=4 \ -oac libmp3lame -oacopts ab=128k @@ -65,19 +65,19 @@ for NTSC) Typical MPEG-4 Part 10 ("AVC", "H.264") encoding, Matroska (MKV) container:: - mplayer infile -o outfile.mkv \ + mpv infile -o outfile.mkv \ -ovc libx264 -ovcopts preset=medium,crf=23,profile=baseline \ -oac vorbis -oacopts qscale=3 Typical MPEG-4 Part 10 ("AVC", "H.264") encoding, MPEG-4 (MP4) container:: - mplayer infile -o outfile.mp4 \ + mpv infile -o outfile.mp4 \ -ovc libx264 -ovcopts preset=medium,crf=23,profile=baseline \ -oac aac -oacopts ab=128k Typical VP8 encoding, WebM (restricted Matroska) container:: - mplayer infile -o outfile.mkv \ + mpv infile -o outfile.mkv \ -of webm \ -ovc libvpx -ovcopts qmin=6,b=1000000k \ -oac libvorbis -oacopts qscale=3 @@ -90,10 +90,10 @@ As the options for various devices can get complex, profiles can be used. An example profile file for encoding is provided in etc/encoding-example-profiles.conf in the source tree. You can include it into -your configuration by doing, from the mplayer2-build directory:: +your configuration by doing, from the mpv-build directory:: - mkdir -p ~/.mplayer - echo "include = $PWD/mplayer/etc/encoding-example-profiles.conf" >> ~/.mplayer/config + mkdir -p ~/.mpv + echo "include = $PWD/mpv/etc/encoding-example-profiles.conf" >> ~/.mpv/config Refer to the top of that file for more comments - in a nutshell, the following options are added by it:: @@ -108,7 +108,7 @@ options are added by it:: You can encode using these with a command line like:: - mplayer infile -o outfile.mp4 -profile enc-to-bb-9000 + mpv infile -o outfile.mp4 -profile enc-to-bb-9000 Of course, you are free to override options set by these profiles by specifying them after the -profile option. @@ -122,15 +122,15 @@ What works * 2-pass encoding (specify flags=+pass1 in the first pass's -ovcopts, specify flags=+pass2 in the second pass) * Hardcoding subtitles using vobsub, ass or srt subtitle rendering (just - configure mplayer for the subtitles as usual) -* Hardcoding any other mplayer OSD (e.g. time codes, using -osdlevel 3 and -vf + configure mpv for the subtitles as usual) +* Hardcoding any other mpv OSD (e.g. time codes, using -osdlevel 3 and -vf expand=::::1) * Encoding directly from a DVD, network stream, webcam, or any other source - mplayer supports + mpv supports * Using x264 presets/tunings/profiles (by using profile=, tune=, preset= in the -ovcopts) -* Deinterlacing/Inverse Telecine with any of mplayer's filters for that -* Audio file converting: mplayer -o outfile.mp3 infile.flac -novideo -oac +* Deinterlacing/Inverse Telecine with any of mpv's filters for that +* Audio file converting: mpv -o outfile.mp3 infile.flac -novideo -oac libmp3lame -oacopts ab=320k * inverse telecine filters (confirmed working: detc, pullup, filmdint) diff --git a/DOCS/man/en/af.rst b/DOCS/man/en/af.rst index dc0450241f..1fe480dcdc 100644 --- a/DOCS/man/en/af.rst +++ b/DOCS/man/en/af.rst @@ -57,7 +57,7 @@ resample[=srate[:sloppy[:type]]] *EXAMPLE*: - ``mplayer --af=resample=44100:0:0`` + ``mpv --af=resample=44100:0:0`` would set the output frequency of the resample filter to 44100Hz using exact output frequency scaling and linear interpolation. @@ -200,7 +200,7 @@ equalizer=[g1:g2:g3:...:g10] *EXAMPLE*: - ``mplayer --af=equalizer=11:11:10:5:0:-12:0:5:12:12 media.avi`` + ``mpv --af=equalizer=11:11:10:5:0:-12:0:5:12:12 media.avi`` Would amplify the sound in the upper and lower frequency region while canceling it almost completely around 1kHz. @@ -223,13 +223,13 @@ channels=nch[:nr:from1:to1:from2:to2:from3:to3:...] *EXAMPLE*: - ``mplayer --af=channels=4:4:0:1:1:0:2:2:3:3 media.avi`` + ``mpv --af=channels=4:4:0:1:1:0:2:2:3:3 media.avi`` Would change the number of channels to 4 and set up 4 routes that swap channel 0 and channel 1 and leave channel 2 and 3 intact. Observe that if media containing two channels was played back, channels 2 and 3 would contain silence but 0 and 1 would still be swapped. - ``mplayer --af=channels=6:4:0:0:0:1:0:2:0:3 media.avi`` + ``mpv --af=channels=6:4:0:0:0:1:0:2:0:3 media.avi`` Would change the number of channels to 6 and set up 4 routes that copy channel 0 to channels 0 to 3. Channel 4 and 5 will contain silence. @@ -242,7 +242,7 @@ format[=format] the sign (either 's' for signed or 'u' for unsigned), 'b' denotes the number of bits per sample (16, 24 or 32) and 'e' denotes the endianness ('le' means little-endian, 'be' big-endian and 'ne' the - endianness of the computer MPlayer is running on). Valid values + endianness of the computer mpv is running on). Valid values (amongst others) are: 's16le', 'u32be' and 'u24ne'. Exceptions to this rule that are also valid format specifiers: u8, s8, floatle, floatbe, floatne, mulaw, alaw, mpeg2, ac3 and imaadpcm. @@ -260,7 +260,7 @@ volume[=v[:sc]] background is gone. This filter has a second feature: It measures the overall maximum sound - level and prints out that level when MPlayer exits. This feature currently + level and prints out that level when mpv exits. This feature currently only works with floating-point data, use e.g. ``--af-adv=force=5``, or use ``--af=stats``. @@ -281,7 +281,7 @@ volume[=v[:sc]] *EXAMPLE*: - ``mplayer --af=volume=10.1:0 media.avi`` + ``mpv --af=volume=10.1:0 media.avi`` Would amplify the sound by 10.1dB and hard-clip if the sound level is too high. @@ -306,10 +306,10 @@ pan=n[:L00:L01:L02:...L10:L11:L12:...Ln0:Ln1:Ln2:...] *EXAMPLE*: - ``mplayer --af=pan=1:0.5:0.5 media.avi`` + ``mpv --af=pan=1:0.5:0.5 media.avi`` Would down-mix from stereo to mono. - ``mplayer --af=pan=3:1:0:0.5:0:1:0.5 media.avi`` + ``mpv --af=pan=3:1:0:0.5:0:1:0.5 media.avi`` Would give 3 channel output leaving channels 0 and 1 intact, and mix channels 0 and 1 into output channel 2 (which could be sent to a subwoofer for example). @@ -338,7 +338,7 @@ sub[=fc:ch] *EXAMPLE*: - ``mplayer --af=sub=100:4 --channels=5 media.avi`` + ``mpv --af=sub=100:4 --channels=5 media.avi`` Would add a sub-woofer channel with a cutoff frequency of 100Hz to output channel 4. @@ -367,7 +367,7 @@ surround[=delay] *EXAMPLE*: - ``mplayer --af=surround=15 --channels=4 media.avi`` + ``mpv --af=surround=15 --channels=4 media.avi`` Would add surround sound decoding with 15ms delay for the sound to the rear speakers. @@ -395,7 +395,7 @@ delay[=ch1:ch2:...] *EXAMPLE*: - ``mplayer --af=delay=10.5:10.5:0:0:7:0 media.avi`` + ``mpv --af=delay=10.5:10.5:0:0:7:0 media.avi`` Would delay front left and right by 10.5ms, the two rear channels and the sub by 0ms and the center channel by 7ms. @@ -410,14 +410,14 @@ export[=mmapped_file[:nsamples]] The rest is payload (non-interleaved) 16 bit data. <mmapped_file> - file to map data to (default: ``~/.mplayer/mplayer-af_export``) + file to map data to (default: ``~/.mpv/mpv-af_export``) <nsamples> number of samples per channel (default: 512) *EXAMPLE*: - ``mplayer --af=export=/tmp/mplayer-af_export:1024 media.avi`` - Would export 1024 samples per channel to ``/tmp/mplayer-af_export``. + ``mpv --af=export=/tmp/mpv-af_export:1024 media.avi`` + Would export 1024 samples per channel to ``/tmp/mpv-af_export``. extrastereo[=mul] (Linearly) increases the difference between left and right channels which @@ -461,7 +461,7 @@ ladspa=file:label[:controls...] <controls> Controls are zero or more floating point values that determine the behavior of the loaded plugin (for example delay, threshold or gain). - In verbose mode (add ``-v`` to the MPlayer command line), all + In verbose mode (add ``-v`` to the mpv command line), all available controls and their valid ranges are printed. This eliminates the use of 'analyseplugin' from the LADSPA SDK. @@ -516,21 +516,21 @@ scaletempo[=option1:option2:...] *EXAMPLE*: - ``mplayer --af=scaletempo --speed=1.2 media.ogg`` + ``mpv --af=scaletempo --speed=1.2 media.ogg`` Would playback media at 1.2x normal speed, with audio at normal pitch. Changing playback speed, would change audio tempo to match. - ``mplayer --af=scaletempo=scale=1.2:speed=none --speed=1.2 media.ogg`` + ``mpv --af=scaletempo=scale=1.2:speed=none --speed=1.2 media.ogg`` Would playback media at 1.2x normal speed, with audio at normal pitch, but changing playback speed has no effect on audio tempo. - ``mplayer --af=scaletempo=stride=30:overlap=.50:search=10 media.ogg`` + ``mpv --af=scaletempo=stride=30:overlap=.50:search=10 media.ogg`` Would tweak the quality and performace parameters. - ``mplayer --af=format=floatne,scaletempo media.ogg`` + ``mpv --af=format=floatne,scaletempo media.ogg`` Would make scaletempo use float code. Maybe faster on some platforms. - ``mplayer --af=scaletempo=scale=1.2:speed=pitch audio.ogg`` + ``mpv --af=scaletempo=scale=1.2:speed=pitch audio.ogg`` Would playback audio file at 1.2x normal speed, with audio at normal pitch. Changing playback speed, would change pitch, leaving audio tempo at 1.2x. diff --git a/DOCS/man/en/ao.rst b/DOCS/man/en/ao.rst index 00dd1e9e6d..412d9ac939 100644 --- a/DOCS/man/en/ao.rst +++ b/DOCS/man/en/ao.rst @@ -9,7 +9,7 @@ syntax is: --ao=<driver1[:suboption1[=value]:...],driver2,...[,]> Specify a priority list of audio output drivers to be used. -If the list has a trailing ',' MPlayer will fall back on drivers not contained +If the list has a trailing ',' mpv will fall back on drivers not contained in the list. Suboptions are optional and can mostly be omitted. *NOTE*: See ``--ao=help`` for a list of compiled-in audio output drivers. @@ -48,7 +48,7 @@ jack port=<name> Connects to the ports with the given name (default: physical ports). name=<client> - Client name that is passed to JACK (default: MPlayer [<PID>]). Useful + Client name that is passed to JACK (default: mpv [<PID>]). Useful if you want to have certain connections established automatically. (no-)estimate Estimate the audio delay, supposed to make the video playback smoother diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index cdbfb8f0ab..5b1c3ea4a6 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -3,10 +3,7 @@ CHANGES FROM OTHER VERSIONS OF MPLAYER ====================================== -xxx: since I don't have a new name yet, I'm referring to this version of mplayer -as **mplayer3**, I don't intend to use that name. - -**mplayer3** is based on mplayer2, which in turn is based on the original +**mpv** is based on mplayer2, which in turn is based on the original MPlayer (also called mplayer, mplayer-svn, mplayer1). Many changes have been made. Some changes are incompatible, or completely change how the player behaves. @@ -37,7 +34,7 @@ General changes for mplayer-svn to mplayer2 * General code cleanups * Many more changes -General changes for mplayer2 to mplayer3 +General changes for mplayer2 to mpv ---------------------------------------- * Removal of lots of unneeded code to encourage developer activity (less @@ -51,9 +48,9 @@ General changes for mplayer2 to mplayer3 languages like Arabic should be better supported. * Cleaned up terminal output (nicer status line, less useless noise) * Support for playing URLs of popular streaming sites directly - (e.g. ``mplayer3 https://www.youtube.com/watch?v=...``) + (e.g. ``mpv https://www.youtube.com/watch?v=...``) * Improved OpenGL output (``vo_opengl``) -* Make ``--softvol`` default (**mplayer3** is not a mixer control panel) +* Make ``--softvol`` default (**mpv** is not a mixer control panel) * Improved support for .cue files * Screenshot improvements (can save screenshots as JPG, configurable filenames) * Removal of teletext support @@ -113,7 +110,7 @@ input.conf and slave commands Other ~~~~~ -* The playtree has been removed. **mplayer3**'s internal playlist is a simple and +* The playtree has been removed. **mpv**'s internal playlist is a simple and flat list now. This makes the code easier, and makes using it less confusing. * Slave mode is broken. This mode is entirely insane in the ``old`` versions of mplayer. A proper slave mode application needed tons of code and hacks to get @@ -123,7 +120,7 @@ Other slave mode application, and as such it's virtually impossible to improve terminal output intended for users without possibly breaking something. - This is absolutely insane, and **mplayer3** will not try to keep slave mode + This is absolutely insane, and **mpv** will not try to keep slave mode compatible. If you're a developer of a slave mode application, contact us, and a new and better protocol can be developed. @@ -152,6 +149,6 @@ Why this fork? withheld as to not turn this into a rant. * mplayer-svn rarely merged from mplayer2, and mplayer2 practically stopped merging from mplayer-svn (not even code cleanups or new features are merged) -* **mplayer3** intents to continuously merge from mplayer-svn and mplayer2, while +* **mpv** intents to continuously merge from mplayer-svn and mplayer2, while speeding up development. There is willingness for significant changes, even if this means breaking compatibility. diff --git a/DOCS/man/en/mplayer.rst b/DOCS/man/en/mpv.rst index 89b03737c3..2cca30c383 100644 --- a/DOCS/man/en/mplayer.rst +++ b/DOCS/man/en/mpv.rst @@ -1,32 +1,32 @@ -mplayer2 manual page +mpv manual page #################### Synopsis ======== -| **mplayer** [options] [file|URL|-] -| **mplayer** [options] --playlist=PLAYLIST -| **mplayer** [options] files -| **mplayer** [options] {group of files and options} -| **mplayer** [bd]://[title][/device] [options] -| **mplayer** dvd://[title|[start\_title]-end\_title][/device] [options] -| **mplayer** \vcd://track[/device] -| **mplayer** \tv://[channel][/input_id] [options] -| **mplayer** radio://[channel|frequency][/capture] [options] -| **mplayer** \pvr:// [options] -| **mplayer** \dvb://[card\_number@]channel [options] -| **mplayer** \mf://[filemask|\@listfile] [-mf options] [options] -| **mplayer** [cdda|cddb]://track[-endtrack][:speed][/device] [options] -| **mplayer** [file|mms[t]|http|http\_proxy|rt[s]p|ftp|udp|unsv|icyx|noicyx|smb]:// [user:pass\@]URL[:port] [options] -| **mplayer** \sdp://file [options] -| **mplayer** \mpst://host[:port]/URL [options] -| **mplayer** \tivo://host/[list|llist|fsid] [options] +| **mpv** [options] [file|URL|-] +| **mpv** [options] --playlist=PLAYLIST +| **mpv** [options] files +| **mpv** [options] {group of files and options} +| **mpv** [bd]://[title][/device] [options] +| **mpv** dvd://[title|[start\_title]-end\_title][/device] [options] +| **mpv** \vcd://track[/device] +| **mpv** \tv://[channel][/input_id] [options] +| **mpv** radio://[channel|frequency][/capture] [options] +| **mpv** \pvr:// [options] +| **mpv** \dvb://[card\_number@]channel [options] +| **mpv** \mf://[filemask|\@listfile] [-mf options] [options] +| **mpv** [cdda|cddb]://track[-endtrack][:speed][/device] [options] +| **mpv** [file|mms[t]|http|http\_proxy|rt[s]p|ftp|udp|unsv|icyx|noicyx|smb]:// [user:pass\@]URL[:port] [options] +| **mpv** \sdp://file [options] +| **mpv** \mpst://host[:port]/URL [options] +| **mpv** \tivo://host/[list|llist|fsid] [options] DESCRIPTION =========== -**mplayer** is a movie player for Linux. It supports a wide variety of video +**mpv** is a movie player based on MPlayer and mplayer2. It supports a wide variety of video file formats, audio and video codecs, and subtitle types. Special input URL types are available to read input from a variety of sources other than disk files. Depending on platform, a variety of different video and audio output @@ -39,8 +39,8 @@ page. INTERACTIVE CONTROL =================== -MPlayer has a fully configurable, command-driven control layer which allows you -to control MPlayer using keyboard, mouse, joystick or remote control (with +mpv has a fully configurable, command-driven control layer which allows you +to control mpv using keyboard, mouse, joystick or remote control (with LIRC). See the ``--input`` option for ways to customize it. keyboard control @@ -283,9 +283,9 @@ the *XXX* option or if *XXX* is compiled in. | It has the following format: | %n%string\_of\_length\_n | *EXAMPLES*: -| `mplayer --ao pcm:file=%10%C:test.wav test.avi` +| `mpv --ao pcm:file=%10%C:test.wav test.avi` | Or in a script: -| `mplayer --ao pcm:file=%\`expr length "$NAME"\`%"$NAME" test.avi` +| `mpv --ao pcm:file=%\`expr length "$NAME"\`%"$NAME" test.avi` Per-file options @@ -294,7 +294,7 @@ Per-file options When playing multiple files, any option given on the command line usually affects all files. Example: -`mplayer --a file1.mkv --b file2.mkv --c` +`mpv --a file1.mkv --b file2.mkv --c` +-----------+-------------------------+ | File | Active options | @@ -311,7 +311,7 @@ Sometimes, it's useful to change options per-file. This can be achieved by adding the special per-file markers `--{` and `--}`. (Note that you must escape these on some shells.) Example: -`mplayer --a file1.mkv --b --\\\{ --c file2.mkv --d file3.mkv --e --\\\} file4.mkv --f` +`mpv --a file1.mkv --b --\\\{ --c file2.mkv --d file3.mkv --e --\\\} file4.mkv --f` +-----------+-------------------------+ | File | Active options | @@ -334,9 +334,9 @@ CONFIGURATION FILES =================== You can put all of the options in configuration files which will be read every -time MPlayer is run. The system-wide configuration file 'mplayer.conf' is in -your configuration directory (e.g. ``/etc/mplayer`` or -``/usr/local/etc/mplayer``), the user specific one is ``~/.mplayer/config``. +time mpv is run. The system-wide configuration file 'mpv.conf' is in +your configuration directory (e.g. ``/etc/mpv`` or +``/usr/local/etc/mpv``), the user specific one is ``~/.mpv/config``. User specific options override system-wide options and options given on the command line override either. The syntax of the configuration files is ``option=<value>``, everything after a *#* is considered a comment. Options @@ -347,16 +347,16 @@ can be specified in this way. You can also write file-specific configuration files. If you wish to have a configuration file for a file called 'movie.avi', create a file named 'movie.avi.conf' with the file-specific options in it and put it in -``~/.mplayer/``. You can also put the configuration file in the same directory +``~/.mpv/``. You can also put the configuration file in the same directory as the file to be played, as long as you give the ``--use-filedir-conf`` option (either on the command line or in your global config file). If a file-specific configuration file is found in the same directory, no -file-specific configuration is loaded from ``~/.mplayer``. In addition, the +file-specific configuration is loaded from ``~/.mpv``. In addition, the ``--use-filedir-conf`` option enables directory-specific configuration files. -For this, MPlayer first tries to load a mplayer.conf from the same directory +For this, mpv first tries to load a mpv.conf from the same directory as the file played and then tries to load any file-specific configuration. -*EXAMPLE MPLAYER CONFIGURATION FILE:* +*EXAMPLE MPV CONFIGURATION FILE:* | # Use gl3 video output by default. | vo=gl3 @@ -379,7 +379,7 @@ description (shown by ``--profile=help``) can be defined with the profile-desc option. To end the profile, start another one or use the profile name *default* to continue with normal options. -*EXAMPLE MPLAYER PROFILE:* +*EXAMPLE MPV PROFILE:* | [protocol.dvd] | profile-desc="profile for dvd:// streams" @@ -438,22 +438,22 @@ ENVIRONMENT VARIABLES ===================== There are a number of environment variables that can be used to control the -behavior of MPlayer. +behavior of mpv. -``MPLAYER_CHARSET`` (see also ``--msgcharset``) +``MPV_CHARSET`` (see also ``--msgcharset``) Convert console messages to the specified charset (default: autodetect). A value of "noconv" means no conversion. -``MPLAYER_HOME`` - Directory where MPlayer looks for user settings. +``MPV_HOME`` + Directory where mpv looks for user settings. -``MPLAYER_LOCALEDIR`` - Directory where MPlayer looks for gettext translation files (if enabled). +``MPV_LOCALEDIR`` + Directory where mpv looks for gettext translation files (if enabled). -``MPLAYER_VERBOSE`` (see also ``-v`` and ``--msglevel``) +``MPV_VERBOSE`` (see also ``-v`` and ``--msglevel``) Set the initial verbosity level across all message modules (default: 0). The resulting verbosity corresponds to that of ``--msglevel=5`` plus the - value of ``MPLAYER_VERBOSE``. + value of ``MPV_VERBOSE``. libaf: ``LADSPA_PATH`` @@ -595,58 +595,58 @@ libavformat: FILES ===== -``/usr/local/etc/mplayer/mplayer.conf`` - MPlayer system-wide settings +``/usr/local/etc/mpv/mpv.conf`` + mpv system-wide settings -``~/.mplayer/config`` - MPlayer user settings +``~/.mpv/config`` + mpv user settings -``~/.mplayer/input.conf`` +``~/.mpv/input.conf`` input bindings (see ``--input=keylist`` for the full list) -``~/.mplayer/DVDkeys/`` +``~/.mpv/DVDkeys/`` cached CSS keys -EXAMPLES OF MPLAYER USAGE +EXAMPLES OF MPV USAGE ========================= Quickstart Blu-ray playing: - - ``mplayer bd:////path/to/disc`` - - ``mplayer bd:// --bluray-device=/path/to/disc`` + - ``mpv bd:////path/to/disc`` + - ``mpv bd:// --bluray-device=/path/to/disc`` Quickstart DVD playing: - ``mplayer dvd://1`` + ``mpv dvd://1`` Play in Japanese with English subtitles: - ``mplayer dvd://1 --alang=ja --slang=en`` + ``mpv dvd://1 --alang=ja --slang=en`` Play only chapters 5, 6, 7: - ``mplayer dvd://1 --chapter=5-7`` + ``mpv dvd://1 --chapter=5-7`` Play only titles 5, 6, 7: - ``mplayer dvd://5-7`` + ``mpv dvd://5-7`` Play a multiangle DVD: - ``mplayer dvd://1 --dvdangle=2`` + ``mpv dvd://1 --dvdangle=2`` Play from a different DVD device: - ``mplayer dvd://1 --dvd-device=/dev/dvd2`` + ``mpv dvd://1 --dvd-device=/dev/dvd2`` Play DVD video from a directory with VOB files: - ``mplayer dvd://1 --dvd-device=/path/to/directory/`` + ``mpv dvd://1 --dvd-device=/path/to/directory/`` Stream from HTTP: - ``mplayer http://mplayer.hq/example.avi`` + ``mpv http://mpv.hq/example.avi`` Stream using RTSP: - ``mplayer rtsp://server.example.com/streamName`` + ``mpv rtsp://server.example.com/streamName`` input from standard V4L: - ``mplayer tv:// --tv=driver=v4l:width=640:height=480:outfmt=i420 --vc=rawi420 --vo=xv`` + ``mpv tv:// --tv=driver=v4l:width=640:height=480:outfmt=i420 --vc=rawi420 --vo=xv`` Play DTS-CD with passthrough: - ``mplayer --ac=hwdts --rawaudio=format=0x2001 --cdrom-device=/dev/cdrom cdda://`` + ``mpv --ac=hwdts --rawaudio=format=0x2001 --cdrom-device=/dev/cdrom cdda://`` You can also use ``--afm=hwac3`` instead of ``--ac=hwdts``. Adjust ``/dev/cdrom`` to match the CD-ROM device on your system. If your external @@ -654,21 +654,23 @@ Play DTS-CD with passthrough: ``cdda://`` without setting format, hwac3 or hwdts. Play a 6-channel AAC file with only two speakers: - ``mplayer --rawaudio=format=0xff --demuxer=rawaudio --af=pan=2:.32:.32:.39:.06:.06:.39:.17:-.17:-.17:.17:.33:.33 adts_he-aac160_51.aac`` + ``mpv --rawaudio=format=0xff --demuxer=rawaudio --af=pan=2:.32:.32:.39:.06:.06:.39:.17:-.17:-.17:.17:.33:.33 adts_he-aac160_51.aac`` You might want to play a bit with the pan values (e.g multiply with a value) to increase volume or avoid clipping. checkerboard invert with geq filter: - ``mplayer --vf=geq='128+(p(X\,Y)-128)*(0.5-gt(mod(X/SW\,128)\,64))*(0.5-gt(mod(Y/SH\,128)\,64))*4'`` + ``mpv --vf=geq='128+(p(X\,Y)-128)*(0.5-gt(mod(X/SW\,128)\,64))*(0.5-gt(mod(Y/SH\,128)\,64))*4'`` AUTHORS ======= +mpv is a MPlayer fork based on mplayer2, which in turn is a fork of MPlayer. + MPlayer was initially written by Arpad Gereoffy. See the ``AUTHORS`` file for a list of some of the many other contributors. -MPlayer is (C) 2000-2011 The MPlayer Team +MPlayer is (C) 2000-2012 The MPlayer Team This man page was written mainly by Gabucino, Jonas Jermann and Diego Biurrun. diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index c52c8b307e..dbac793fa9 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -14,7 +14,7 @@ Specify a priority list of audio codecs to be used, according to their codec name in codecs.conf. Use a '-' before the codec name to omit it. Use a '+' before the codec name to force it, this will likely crash! If - the list has a trailing ',' MPlayer will fall back on codecs not contained + the list has a trailing ',' mpv will fall back on codecs not contained in the list. *NOTE*: See ``--ac=help`` for a full list of available codecs. @@ -58,7 +58,7 @@ may silently fail, and the sound quality may drop. 3 Use no automatic insertion of filters and no optimization. - *Warning*: It may be possible to crash MPlayer using this setting. + *Warning*: It may be possible to crash mpv using this setting. 4 Use automatic insertion of filters according to 0 above, but use floating point processing when possible. @@ -95,15 +95,15 @@ Specify a priority list of audio languages to use. Different container formats employ different language codes. DVDs use ISO 639-1 two letter language codes, Matroska, MPEG-TS and NUT use ISO 639-2 three letter - language codes while OGM uses a free-form identifier. MPlayer prints the + language codes while OGM uses a free-form identifier. mpv prints the available languages when run in verbose (``-v``) mode. See also ``--aid``. *EXAMPLE*: - ``mplayer dvd://1 --alang=hu,en`` + ``mpv dvd://1 --alang=hu,en`` Chooses the Hungarian language track on a DVD and falls back on English if Hungarian is not available. - ``mplayer --alang=jpn example.mkv`` + ``mpv --alang=jpn example.mkv`` Plays a Matroska file in Japanese. --ao=<driver1[:suboption1[=value]:...],driver2,...[,]> @@ -245,11 +245,11 @@ --bluray-angle=<ID> Some Blu-ray discs contain scenes that can be viewed from multiple angles. - Here you can tell MPlayer which angles to use (default: 1). + Here you can tell mpv which angles to use (default: 1). --bluray-chapter=<ID> (Blu-ray only) - Tells MPlayer which Blu-ray chapter to start the current title from + Tells mpv which Blu-ray chapter to start the current title from (default: 1). --bluray-device=<path> @@ -278,12 +278,12 @@ --cache-seek-min=<percentage> If a seek is to be made to a position within <percentage> of the cache - size from the current position, MPlayer will wait for the cache to be + size from the current position, mpv will wait for the cache to be filled to this position rather than performing a stream seek (default: 50). --cdda=<option1:option2> - This option can be used to tune the CD Audio reading feature of MPlayer. + This option can be used to tune the CD Audio reading feature of mpv. Available options are: @@ -323,7 +323,7 @@ Specify the CD-ROM device (default: ``/dev/cdrom``). --channels=<number> - Request the number of playback channels (default: 2). MPlayer asks the + Request the number of playback channels (default: 2). mpv asks the decoder to decode the audio into as many channels as specified. Then it is up to the decoder to fulfill the requirement. This is usually only important when playing videos with AC-3 audio (like DVDs). In that case @@ -457,7 +457,7 @@ assumed to be in Netscape format. --correct-pts, --no-correct-pts - Switches MPlayer to a mode where timestamps for video frames are + Switches mpv to a mode where timestamps for video frames are calculated differently and video filters which add new frames or modify timestamps of existing ones are supported. Now enabled automatically for most common file formats. The more accurate timestamps can be visible for @@ -502,10 +502,10 @@ override the default ones: :card=<1-4>: Specifies using card number 1-4 (default: 1). - :file=<filename>: Instructs MPlayer to read the channels list from + :file=<filename>: Instructs mpv to read the channels list from <filename>. Default is - ``~/.mplayer/channels.conf.{sat,ter,cbl,atsc}`` (based - on your card type) or ``~/.mplayer/channels.conf`` as a + ``~/.mpv/channels.conf.{sat,ter,cbl,atsc}`` (based + on your card type) or ``~/.mpv/channels.conf`` as a last resort. :timeout=<1-30>: Maximum number of seconds to wait when trying to tune a frequency before giving up (default: 30). @@ -519,7 +519,7 @@ Try to limit DVD speed (default: 0, no change). DVD base speed is 1385 kB/s, so a 8x drive can read at speeds up to 11080 kB/s. Slower speeds make the drive more quiet. For watching DVDs 2700 kB/s should be quiet and - fast enough. MPlayer resets the speed to the drive default value on close. + fast enough. mpv resets the speed to the drive default value on close. Values of at least 100 mean speed in kB/s. Values less than 100 mean multiples of 1385 kB/s, i.e. ``--dvd-speed=8`` selects 11080 kB/s. @@ -527,12 +527,12 @@ --dvdangle=<ID> Some DVD discs contain scenes that can be viewed from multiple angles. - Here you can tell MPlayer which angles to use (default: 1). + Here you can tell mpv which angles to use (default: 1). --edition=<ID> (Matroska files only) Specify the edition (set of chapters) to use, where 0 is the first. If set - to -1 (the default), MPlayer will choose the first edition declared as a + to -1 (the default), mpv will choose the first edition declared as a default, or if there is no default, the first edition defined. --edlout=<filename> @@ -611,16 +611,16 @@ specify a particular font. See also ``--subfont``. With fontconfig enabled the argument is a fontconfig pattern and the default is ``sans``. Without fontconfig the argument is a filename and the default is - ``~/.mplayer/subfont.ttf``. + ``~/.mpv/subfont.ttf``. *EXAMPLE*: - - ``--font=~/.mplayer/arialuni.ttf`` (no fontconfig) + - ``--font=~/.mpv/arialuni.ttf`` (no fontconfig) - ``--font='Bitstream Vera Sans'`` (usual case with fontconfig) - ``--font='Bitstream Vera Sans:style=Bold'`` (usual case with fontconfig) --force-window-position - Forcefully move MPlayer's video output window to default location whenever + Forcefully move mpv's video output window to default location whenever there is a change in video parameters, video stream or file. This used to be the default behavior. Currently only affects X11 VOs. @@ -760,7 +760,7 @@ Command that is executed every 30 seconds during playback via *system()* - i.e. using the shell. - *NOTE*: mplayer uses this command without any checking, it is your + *NOTE*: mpv uses this command without any checking, it is your responsibility to ensure it does not cause security problems (e.g. make sure to use full paths if "." is in your path like on Windows). It also only works when playing video (i.e. not with ``--no-video`` but works with @@ -771,10 +771,10 @@ complicated, ask the author of the screensaver program to support the proper X APIs. - *EXAMPLE for xscreensaver*: ``mplayer --heartbeat-cmd="xscreensaver-command + *EXAMPLE for xscreensaver*: ``mpv --heartbeat-cmd="xscreensaver-command -deactivate" file`` - *EXAMPLE for GNOME screensaver*: ``mplayer + *EXAMPLE for GNOME screensaver*: ``mpv --heartbeat-cmd="gnome-screensaver-command -p" file`` --help @@ -821,7 +821,7 @@ *EXAMPLE*: - ``mplayer --http-header-fields='Field1: value1','Field2: value2' http://localhost:1234`` + ``mpv --http-header-fields='Field1: value1','Field2: value2' http://localhost:1234`` Will generate HTTP request: @@ -845,12 +845,12 @@ by using ``--msglevel=identify=6``. For example, for a DVD or Blu-ray it will list the chapters and time length of each title, as well as a disk ID. Combine this with ``--frames=0`` to suppress all video output. The - wrapper script ``TOOLS/midentify.sh`` suppresses the other MPlayer output + wrapper script ``TOOLS/midentify.sh`` suppresses the other mpv output and (hopefully) shellescapes the filenames. --idle - Makes MPlayer wait idly instead of quitting when there is no file to play. - Mostly useful in slave mode where MPlayer can be controlled through input + Makes mpv wait idly instead of quitting when there is no file to play. + Mostly useful in slave mode where mpv can be controlled through input commands (see also ``--slave``). --idx @@ -874,17 +874,17 @@ Specify configuration file to be parsed after the default ones. --initial-audio-sync, --no-initial-audio-sync - When starting a video file or after events such as seeking MPlayer will by + When starting a video file or after events such as seeking mpv will by default modify the audio stream to make it start from the same timestamp as video, by either inserting silence at the start or cutting away the first samples. Disabling this option makes the player behave like older - MPlayer versions did: video and audio are both started immediately even if + mpv versions did: video and audio are both started immediately even if their start timestamps differ, and then video timing is gradually adjusted if necessary to reach correct synchronization later. --input=<commands> This option can be used to configure certain parts of the input system. - Paths are relative to ``~/.mplayer/``. + Paths are relative to ``~/.mpv/``. *NOTE*: Autorepeat is currently only supported by joysticks. @@ -892,7 +892,7 @@ conf=<filename> Specify input configuration file other than the default - ``~/.mplayer/input.conf``. ``~/.mplayer/<filename>`` is assumed if no + ``~/.mpv/input.conf``. ``~/.mpv/<filename>`` is assumed if no full path is given. ar-dev=<device> @@ -907,7 +907,7 @@ Number of key presses to generate per second on autorepeat. (no)default-bindings - Use the key bindings that MPlayer ships with by default. + Use the key bindings that mpv ships with by default. keylist Prints all keys that can be bound to commands. @@ -922,7 +922,7 @@ Read commands from the given file. Mostly useful with a FIFO. See also ``--slave``. - *NOTE*: When the given file is a FIFO MPlayer opens both ends so you + *NOTE*: When the given file is a FIFO mpv opens both ends so you can do several `echo "seek 10" > mp_pipe` and the pipe will stay valid. @@ -935,7 +935,7 @@ --keepaspect, --no-keepaspect Keep window aspect ratio when resizing windows. Enabled by default. By - default MPlayer tries to keep the correct video aspect ratio by + default mpv tries to keep the correct video aspect ratio by instructing the window manager to maintain window aspect when resizing, and by adding black bars if the window manager nevertheless allows window shape to change. --no-keepaspect disables window manager aspect hints and @@ -1106,7 +1106,7 @@ Note, a patch to make the *o=* unneeded and pass all unknown options through the AVOption system is welcome. A full list of AVOptions can be found in the FFmpeg manual. Note that some options may conflict - with MPlayer options. + with mpv options. *EXAMPLE*: ``o=fflags=+ignidx`` probesize=<value> @@ -1133,11 +1133,11 @@ --loadidx=<filename> The file from which to read the video index data saved by ``--saveidx``. This index will be used for seeking, overriding any index data contained - in the AVI itself. MPlayer will not prevent you from loading an index file + in the AVI itself. mpv will not prevent you from loading an index file generated from a different AVI, but this is sure to cause unfavorable results. - *NOTE*: This option is obsolete now that MPlayer has OpenDML support. + *NOTE*: This option is obsolete now that mpv has OpenDML support. --loop=<number|inf|no> Loops playback <number> times. ``inf`` means forever and ``no`` disables @@ -1162,7 +1162,7 @@ --mixer-channel=<name[,index]> (``--ao=oss`` and ``--ao=alsa`` only) - This option will tell MPlayer to use a different channel for controlling + This option will tell mpv to use a different channel for controlling volume than the default PCM. Options for OSS include **vol, pcm, line**. For a complete list of options look for ``SOUND_DEVICE_NAMES`` in ``/usr/include/linux/soundcard.h``. For ALSA you can use the names e.g. @@ -1189,7 +1189,7 @@ also ``--monitoraspect`` and ``--aspect``. --mouse-movements - Permit MPlayer to receive pointer events reported by the video output + Permit mpv to receive pointer events reported by the video output driver. Necessary to select the buttons in DVD menus. Supported for X11-based VOs (x11, xv, etc) and the gl, direct3d and corevideo VOs. @@ -1208,7 +1208,7 @@ *NOTE*: Some messages are printed before the command line is parsed and are therefore not affected by ``--msglevel``. To control these messages - you have to use the ``MPLAYER_VERBOSE`` environment variable; see its + you have to use the ``MPV_VERBOSE`` environment variable; see its description below for details. Available levels: @@ -1284,7 +1284,7 @@ --ordered-chapters, --no-ordered-chapters Enabled by default. - Disable support for Matroska ordered chapters. MPlayer will not load or + Disable support for Matroska ordered chapters. mpv will not load or search for video segments from other files, and will also ignore any chapter order specified for the main file. @@ -1342,9 +1342,9 @@ Play files according to a playlist file (ASX, Winamp, SMIL, or one-file-per-line format). - *WARNING*: The way MPlayer parses and uses playlist files is not safe + *WARNING*: The way mpv parses and uses playlist files is not safe against maliciously constructed files. Such files may trigger harmful - actions. This has been the case for all MPlayer versions, but + actions. This has been the case for all mpv and MPlayer versions, but unfortunately this fact was not well documented earlier, and some people have even misguidedly recommended use of ``--playlist`` with untrusted sources. Do NOT use ``--playlist`` with random internet sources or files @@ -1373,7 +1373,7 @@ --priority=<prio> (Windows only.) - Set process priority for MPlayer according to the predefined priorities + Set process priority for mpv according to the predefined priorities available under Windows. Possible values of <prio>: @@ -1402,7 +1402,7 @@ the V4L2 driver. The Hauppauge WinTV PVR-150/250/350/500 and all IVTV based cards are known as PVR capture cards. Be aware that only Linux 2.6.18 kernel and above is able to handle MPEG stream through V4L2 layer. - For hardware capture of an MPEG stream and watching it with MPlayer, use + For hardware capture of an MPEG stream and watching it with mpv, use ``pvr://`` as a movie URL. Available options are: @@ -1460,10 +1460,10 @@ --radio=<option1:option2:...> These options set various parameters of the radio capture module. For - listening to radio with MPlayer use ``radio://<frequency>`` (if channels + listening to radio with mpv use ``radio://<frequency>`` (if channels option is not given) or ``radio://<channel_number>`` (if channels option is given) as a movie URL. You can see allowed frequency range by running - MPlayer with ``-v``. To start the grabbing subsystem, use + mpv with ``-v``. To start the grabbing subsystem, use ``radio://<frequency or channel>/capture``. If the capture keyword is not given you can listen to radio using the line-in cable only. Using capture to listen is not recommended due to synchronization problems, which makes @@ -1523,7 +1523,7 @@ :channels=<value>: number of channels :rate=<value>: rate in samples per second - :format=<value>: mplayer audio format (e.g. s16le) + :format=<value>: mpv audio format (e.g. s16le) --rawvideo=<option1:option2:...> This option lets you play raw video files. You have to use @@ -1543,10 +1543,10 @@ *EXAMPLE*: - - ``mplayer foreman.qcif --demuxer=rawvideo --rawvideo=qcif`` Play the + - ``mpv foreman.qcif --demuxer=rawvideo --rawvideo=qcif`` Play the famous "foreman" sample video. - - ``mplayer sample-720x576.yuv --demuxer=rawvideo --rawvideo=w=720:h=576`` + - ``mpv sample-720x576.yuv --demuxer=rawvideo --rawvideo=w=720:h=576`` Play a raw YUV sample. --really-quiet @@ -1568,7 +1568,7 @@ Used with ``rtsp://`` URLs to force the destination IP address to be bound. This option may be useful with some RTSP server which do not send RTP packets to the right interface. If the connection to the RTSP server - fails, use ``-v`` to see which IP address MPlayer tries to bind to and try + fails, use ``-v`` to see which IP address mpv tries to bind to and try to force it to one assigned to your computer instead. --rtsp-port @@ -1576,18 +1576,6 @@ may be useful if you are behind a router and want to forward the RTSP stream from the server to a specific client. ---rtsp-stream-over-http - (LIVE555 only) - Used with ``http://`` URLs to specify that the resulting incoming RTP and - RTCP packets be streamed over HTTP. - ---rtsp-stream-over-tcp - (LIVE555 and NEMESI only) - Used with ``rtsp://`` URLs to specify that the resulting incoming RTP and - RTCP packets be streamed over TCP (using the same TCP connection as RTSP). - This option may be useful if you have a broken internet connection that - does not pass incoming UDP packets (see http://www.live555.com/mplayer/). - --saturation=<-100-100> Adjust the saturation of the video signal (default: 0). You can get grayscale output with this option. Not supported by all video output @@ -1597,7 +1585,7 @@ Force index rebuilding and dump the index to <filename>. Currently this only works with AVI files. - *NOTE*: This option is obsolete now that MPlayer has OpenDML support. + *NOTE*: This option is obsolete now that mpv has OpenDML support. --sb=<n> Seek to byte position. Useful for playback from CD-ROM images or VOB files @@ -1647,7 +1635,7 @@ passing the format ``%04n`` will yield ``0012`` on the 12th screenshot. The number is incremented every time a screenshot is taken, or if the file already exists. The length ``X`` must be in the range 0-9. With - the optional # sign mplayer will use the lowest available number. For + the optional # sign mpv will use the lowest available number. For example, if you take three screenshots--0001, 0002, 0003--and delete the first two, the next two screenshots won't be 0004 and 0005, but 0001 and 0002 again. @@ -1703,14 +1691,14 @@ Specify a priority list of subtitle languages to use. Different container formats employ different language codes. DVDs use ISO 639-1 two letter language codes, Matroska uses ISO 639-2 three letter language codes while - OGM uses a free-form identifier. MPlayer prints the available languages + OGM uses a free-form identifier. mpv prints the available languages when run in verbose (``-v``) mode. See also ``--sid``. *EXAMPLE*: - - ``mplayer dvd://1 --slang=hu,en`` chooses the Hungarian subtitle track on + - ``mpv dvd://1 --slang=hu,en`` chooses the Hungarian subtitle track on a DVD and falls back on English if Hungarian is not available. - - ``mplayer --slang=jpn example.mkv`` plays a Matroska file with Japanese + - ``mpv --slang=jpn example.mkv`` plays a Matroska file with Japanese subtitles. --slave-broken @@ -1721,7 +1709,7 @@ particular, the status line output was changed, which is used by some applications to determine the current playback position. This switch has been renamed to prevent these applications from working with this version - of mplayer, because it would lead to buggy and confusing behavior only. + of mpv, because it would lead to buggy and confusing behavior only. Moreover, the slave mode protocol is so horribly bad that it should not be used for new programs, nor should existing programs attempt to adapt to the changed output and use the --slave-broken switch. Instead, a new, saner @@ -1737,13 +1725,13 @@ --softsleep Time frames by repeatedly checking the current time instead of asking - the kernel to wake up MPlayer at the correct time. Useful if your kernel + the kernel to wake up mpv at the correct time. Useful if your kernel timing is imprecise and you cannot use the RTC either. Comes at the price of higher CPU consumption. --softvol=<mode> Control whether to use the volume controls of the audio output driver, or - the internal mplayer volume filter. + the internal mpv volume filter. :no: prefer audio driver controls, use the volume filter only if absolutely needed @@ -1751,7 +1739,7 @@ :auto: prefer the volume filter if the audio driver uses the system mixer (default) The intention with ``auto`` is to avoid changing system mixer settings with - default settings. mplayer is a video player, not a mixer panel. On the other + default settings. mpv is a video player, not a mixer panel. On the other hand, mixer controls should be used for sound servers like PulseAudio, which provide per-application volume. @@ -1818,7 +1806,7 @@ *EXAMPLE*: ``--vf=scale=-ssf=lgb=3.0`` --sstep=<sec> - Skip <sec> seconds after every frame. Since MPlayer will only seek to + Skip <sec> seconds after every frame. Since mpv will only seek to the next keyframe unless you use ``--hr-seek`` this may be inexact. --stereo=<mode> @@ -1870,14 +1858,14 @@ to video file directory. *EXAMPLE*: Assuming that ``/path/to/movie/movie.avi`` is played and - ``--sub-paths=sub:subtitles:/tmp/subs`` is specified, MPlayer searches for + ``--sub-paths=sub:subtitles:/tmp/subs`` is specified, mpv searches for subtitle files in these directories: - ``/path/to/movie/`` - ``/path/to/movie/sub/`` - ``/path/to/movie/subtitles/`` - ``/tmp/subs/`` - - ``~/.mplayer/sub/`` + - ``~/.mpv/sub/`` --subcp=<codepage> If your system supports ``iconv(3)``, you can use this option to specify @@ -1894,7 +1882,7 @@ You can specify your language using a two letter language code to make ENCA detect the codepage automatically. If unsure, enter anything and - watch mplayer ``-v`` output for available languages. Fallback codepage + watch mpv ``-v`` output for available languages. Fallback codepage specifies the codepage to use, when autodetection fails. *EXAMPLE*: @@ -1996,7 +1984,7 @@ --tv=<option1:option2:...> This option tunes various properties of the TV capture module. For - watching TV with MPlayer, use ``tv://`` or ``tv://<channel_number>`` or + watching TV with mpv, use ``tv://`` or ``tv://<channel_number>`` or even ``tv://<channel_name>`` (see option channels for channel_name below) as a movie URL. You can also use ``tv:///<input_id>`` to start watching a movie from a composite or S-Video input (see option input for details). @@ -2136,7 +2124,7 @@ mjpeg Use hardware MJPEG compression (if the card supports it). When using this option, you do not need to specify the width and height of the - output window, because MPlayer will determine it automatically from + output window, because mpv will determine it automatically from the decimation value (see below). decimation=<1|2|4> @@ -2187,7 +2175,7 @@ in size, resulting in choppy video when using immediatemode=0. --tvscan=<option1:option2:...> - Tune the TV channel scanner. MPlayer will also print value for "-tv + Tune the TV channel scanner. mpv will also print value for "-tv channels=" option, including existing and just found channels. Available suboptions are: @@ -2206,7 +2194,7 @@ indicate that the currently scanning channel is active. --unicode - Tells MPlayer to handle the subtitle file as unicode. + Tells mpv to handle the subtitle file as unicode. --use-filedir-conf Look for a file-specific configuration file in the same directory as the @@ -2222,7 +2210,7 @@ Use <string> as user agent for HTTP streaming. --utf8 - Tells MPlayer to handle the subtitle file as UTF-8. + Tells mpv to handle the subtitle file as UTF-8. -v Increment verbosity level, one level for each ``-v`` found on the command @@ -2232,7 +2220,7 @@ Specify a priority list of video codecs to be used, according to their codec name in ``codecs.conf``. Use a '-' before the codec name to omit it. Use a '+' before the codec name to force it, this will likely crash! If - the list has a trailing ',' MPlayer will fall back on codecs not contained + the list has a trailing ',' mpv will fall back on codecs not contained in the list. *NOTE*: See ``--vc=help`` for a full list of available codecs. @@ -2300,10 +2288,10 @@ --wid=<ID> (X11, OpenGL and DirectX only) - This tells MPlayer to attach to an existing window. Useful to embed - MPlayer in a browser (e.g. the plugger extension). Earlier this option + This tells mpv to attach to an existing window. Useful to embed + mpv in a browser (e.g. the plugger extension). Earlier this option always filled the given window completely, thus aspect scaling, panscan, - etc were no longer handled by MPlayer but had to be managed by the + etc were no longer handled by mpv but had to be managed by the application that created the window. Now aspect is maintained by default. If you don't want that use ``--no-keepaspect``. @@ -2313,7 +2301,7 @@ --xineramascreen=<-2-...> In Xinerama configurations (i.e. a single desktop that spans across - multiple displays) this option tells MPlayer which screen to display the + multiple displays) this option tells mpv which screen to display the movie on. A value of -2 means fullscreen across the whole virtual display (in this case Xinerama information is completely ignored), -1 means fullscreen on the display the window currently is on. The initial position @@ -2360,4 +2348,4 @@ --zoom Allow software scaling, where available. This will allow scaling with output drivers (like x11) that do not support hardware scaling, - where MPlayer disables scaling by default for performance reasons. + where mpv disables scaling by default for performance reasons. diff --git a/DOCS/man/en/vo.rst b/DOCS/man/en/vo.rst index 265edec0b2..dd5b0f72ef 100644 --- a/DOCS/man/en/vo.rst +++ b/DOCS/man/en/vo.rst @@ -9,7 +9,7 @@ syntax is: --vo=<driver1[:suboption1[=value]:...],driver2,...[,]> Specify a priority list of video output drivers to be used. -If the list has a trailing ',' MPlayer will fall back on drivers not contained +If the list has a trailing ',' mpv will fall back on drivers not contained in the list. Suboptions are optional and can mostly be omitted. *NOTE*: See ``--vo=help`` for a list of compiled-in video output drivers. @@ -26,7 +26,7 @@ xv (X11 only) the most compatible VO on X, but may be low quality, and has issues with OSD and subtitle display. For information about what colorkey is used and how it is drawn run - MPlayer with ``-v`` option and look out for the lines tagged with ``[xv + mpv with ``-v`` option and look out for the lines tagged with ``[xv common]`` at the beginning. adaptor=<number> @@ -39,7 +39,7 @@ xv (X11 only) cur The default takes the colorkey currently set in Xv. use - Use but do not set the colorkey from MPlayer (use the ``--colorkey`` + Use but do not set the colorkey from mpv (use the ``--colorkey`` option to change it). set Same as use but also sets the supplied colorkey. @@ -128,8 +128,8 @@ vdpau (X11 only) 3). See below for additional information. Using the VDPAU frame queueing functionality controlled by the queuetime - options makes MPlayer's frame flip timing less sensitive to system CPU - load and allows MPlayer to start decoding the next frame(s) slightly + options makes mpv's frame flip timing less sensitive to system CPU + load and allows mpv to start decoding the next frame(s) slightly earlier which can reduce jitter caused by individual slow-to-decode frames. However the NVIDIA graphics drivers can make other window behavior such as window moves choppy if VDPAU is using the blit queue (mainly @@ -334,7 +334,7 @@ opengl Positive non-zero values select the target bit depth. Default: 0. \-1 - Disable any dithering done by mplayer. + Disable any dithering done by mpv. 0 Automatic selection. If output bit depth can't be detected, 8 bits per component are assumed. diff --git a/DOCS/tech-overview.txt b/DOCS/tech-overview.txt index 9acfe846cf..9ffe891c5c 100644 --- a/DOCS/tech-overview.txt +++ b/DOCS/tech-overview.txt @@ -1,6 +1,6 @@ NOTE: DOCS/OUTDATED-tech/* may contain more detailed information, but most of it is possibly or definitely outdated. This file intends to give a big - picture of how mplayer is structured. + picture of how mplayer/mpv is structured. mplayer.c: This contains the main play loop, anything related to mplayer and playback @@ -65,8 +65,8 @@ talloc.h & talloc.c: One very useful feature of talloc is fast tracking of memory leaks. ("Fast" as in it doesn't require valgrind.) You can enable it by passing the option --leak-report as first parameter, or better, setting the - MPLAYER_LEAK_REPORT environment variable to "1": - export MPLAYER_LEAK_REPORT=1 + MPV_LEAK_REPORT environment variable to "1": + export MPV_LEAK_REPORT=1 This will list all unfree'd allocations on exit. Documentation can be found here: @@ -284,15 +284,15 @@ OBJS_MPLAYER += $(OBJS_MPLAYER-yes) MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS) DEP_FILES = $(patsubst %.S,%.d,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON:.m=.d) $(SRCS_MPLAYER:.m=.d)))) -ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) +ALL_PRG-$(MPLAYER) += mpv$(EXESUF) INSTALL_TARGETS-$(MPLAYER) += check_rst2man \ - install-mplayer \ - install-mplayer-man \ - install-mplayer-msg + install-mpv \ + install-mpv-man \ + install-mpv-msg -INSTALL_NO_MAN_TARGETS-$(MPLAYER) += install-mplayer \ - install-mplayer-msg +INSTALL_NO_MAN_TARGETS-$(MPLAYER) += install-mpv \ + install-mpv-msg DIRS = . \ input \ @@ -306,7 +306,7 @@ DIRS = . \ sub \ timeline \ -MOFILES := $(MSG_LANGS:%=locale/%/LC_MESSAGES/mplayer.mo) +MOFILES := $(MSG_LANGS:%=locale/%/LC_MESSAGES/mpv.mo) ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h)) @@ -343,9 +343,9 @@ all: $(ALL_PRG-yes) locales %-rc.o: %.rc $(WINDRES) -I. $< $@ -mplayer$(EXESUF): $(MPLAYER_DEPS) -mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER) -mplayer$(EXESUF): +mpv$(EXESUF): $(MPLAYER_DEPS) +mpv$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER) +mpv$(EXESUF): $(CC) -o $@ $^ $(EXTRALIBS) codec-cfg.c: codecs.conf.h @@ -393,7 +393,7 @@ version.h .version: version.sh locales: $(MOFILES) -locale/%/LC_MESSAGES/mplayer.mo: po/%.po +locale/%/LC_MESSAGES/mpv.mo: po/%.po mkdir -p $(dir $@) msgfmt -c -o $@ $< @@ -428,42 +428,40 @@ install-dirs: install-%: %$(EXESUF) install-dirs $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) -install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang)) -install-mplayer-msg: $(foreach lang,$(MSG_LANGS),install-mplayer-msg-$(lang)) +install-mpv-man: $(foreach lang,$(MAN_LANGS),install-mpv-man-$(lang)) +install-mpv-msg: $(foreach lang,$(MSG_LANGS),install-mpv-msg-$(lang)) -install-mplayer-man-en: DOCS/man/en/mplayer.1 +install-mpv-man-en: DOCS/man/en/mpv.1 if test ! -d $(MANDIR)/man1 ; then $(INSTALL) -d $(MANDIR)/man1 ; fi - $(INSTALL) -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/ + $(INSTALL) -m 644 DOCS/man/en/mpv.1 $(MANDIR)/man1/ define MPLAYER_MAN_RULE -install-mplayer-man-$(lang): DOCS/man/$(lang)/mplayer.1 +install-mpv-man-$(lang): DOCS/man/$(lang)/mpv.1 if test ! -d $(MANDIR)/$(lang)/man1 ; then $(INSTALL) -d $(MANDIR)/$(lang)/man1 ; fi - $(INSTALL) -m 644 DOCS/man/$(lang)/mplayer.1 $(MANDIR)/$(lang)/man1/ + $(INSTALL) -m 644 DOCS/man/$(lang)/mpv.1 $(MANDIR)/$(lang)/man1/ endef $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MPLAYER_MAN_RULE))) define MPLAYER_MSG_RULE -install-mplayer-msg-$(lang): +install-mpv-msg-$(lang): if test ! -d $(LOCALEDIR)/$(lang)/LC_MESSAGES ; then $(INSTALL) -d $(LOCALEDIR)/$(lang)/LC_MESSAGES ; fi - $(INSTALL) -m 644 locale/$(lang)/LC_MESSAGES/mplayer.mo $(LOCALEDIR)/$(lang)/LC_MESSAGES/ + $(INSTALL) -m 644 locale/$(lang)/LC_MESSAGES/mpv.mo $(LOCALEDIR)/$(lang)/LC_MESSAGES/ endef $(foreach lang,$(MSG_LANG_ALL),$(eval $(MPLAYER_MSG_RULE))) uninstall: - $(RM) $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) - $(RM) $(prefix)/share/pixmaps/mplayer.xpm - $(RM) $(prefix)/share/applications/mplayer.desktop - $(RM) $(MANDIR)/man1/mplayer.1 - $(RM) $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1,$(MANDIR)/$(lang)/man1/$(man))) - $(RM) $(foreach lang,$(MSG_LANGS),$(LOCALEDIR)/$(lang)/LC_MESSAGES/mplayer.1) + $(RM) $(BINDIR)/mpv$(EXESUF) + $(RM) $(MANDIR)/man1/mpv.1 + $(RM) $(foreach lang,$(MAN_LANGS),$(foreach man,mpv.1,$(MANDIR)/$(lang)/man1/$(man))) + $(RM) $(foreach lang,$(MSG_LANGS),$(LOCALEDIR)/$(lang)/LC_MESSAGES/mpv.1) clean: -$(RM) $(call ADD_ALL_DIRS,/*.o /*.d /*.a /*.ho /*~) - -$(RM) $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1,DOCS/man/$(lang)/$(man))) + -$(RM) $(foreach lang,$(MAN_LANGS),$(foreach man,mpv.1,DOCS/man/$(lang)/$(man))) -$(RM) $(call ADD_ALL_DIRS,/*.o /*.a /*.ho /*~) - -$(RM) $(call ADD_ALL_EXESUFS,mplayer) + -$(RM) $(call ADD_ALL_EXESUFS,mpv) -$(RM) $(MOFILES) -$(RM) version.h -$(RM) codecs.conf.h diff --git a/TOOLS/binary_codecs.sh b/TOOLS/binary_codecs.sh deleted file mode 100755 index 5ab3b3993c..0000000000 --- a/TOOLS/binary_codecs.sh +++ /dev/null @@ -1,219 +0,0 @@ -#!/bin/sh -set -e - -# avoid insecure tempfile creation -umask 0022 - -# This script will download binary codecs for MPlayer unto a Debian system. - -# Author: thuglife, mennucc1 -# - -CODECDIR=/usr/lib/codecs -PREFDIR=/var/lib/mplayer/prefs -MYSITE='http://people.debian.org/~mennucc1/mplayer' - -dpkgarch=$(dpkg --print-architecture) - -[ -d $PREFDIR ] || mkdir -v $PREFDIR -[ -d $CODECDIR ] || mkdir -v $CODECDIR -cd $CODECDIR -[ -d mplayer_binary_codecs ] || mkdir -v mplayer_binary_codecs - -choosemirror () -{ - cd $PREFDIR - - #if [ ! -r mirrors ] || find mirrors -mtime +20 ; then - echo "Downloading mirrors list" - wget -nv -c -N $MYSITE/mirrors || true - #fi - if [ ! -r bestsites ] || [ mirrors -nt bestsites ] || \ - find bestsites -mtime +20 | grep -q bestsites ; then - if which netselect > /dev/null ; then - echo Choosing best mirrors using netselect - netselect -s 5 -t 5 $( cat mirrors ) | awk '{print $2}' > bestsites - elif which fping > /dev/null ; then - fping -C 1 $( sed 's#.*//##;s#/.*##' mirrors ) 2>&1 | \ - egrep -v 'bytes.*loss' | sort -n -k3 | \ - grep -v ': *-' | awk '/:/{print $1}' | head -5 | ( while read mainsite ; do - grep $mainsite $PREFDIR/mirrors ; done ) > bestsites - else - echo "(If you install 'netselect' or 'fping', it will select the best mirror for you" - echo " you may wish to stop this script and rerun after installation)" - sleep 3 - fi - fi -} - -INSTALL () { - filename="$3" - dir="$2" - url="$1" - - cd $CODECDIR/mplayer_binary_codecs - - if [ -r $filename ] ; then - cp $filename $filename.bak - fi - - if [ "$url" = @MAINSITE@ ] ; then - list=$PREFDIR/bestsites - test -r $list || list=$PREFDIR/mirrors - cat $list | while read mainsite ; do - echo Downloading $filename from $mainsite ... - wget -c -N $mainsite/$dir/$filename || true - if [ -r "$filename" ] ; then - UNPACK "$filename" - return 0 - fi - done - else - wget -c -N $url/$dir/$filename || true - if [ -r "$filename" ] ; then - UNPACK "$filename" - return 0 - fi - fi -} - - -UNPACK () -{ - filename="$1" - if [ -r $filename.bak ] && cmp $filename.bak $filename && [ -r $filename.list ] ; then - echo It appears that $filename was already succesfully installed - [ -r $filename.bak ] && rm $filename.bak - else - if grep -q " $filename$" $PREFDIR/MD5SUMS ; then - echo Checking MD5 for $filename - grep " $filename$" $PREFDIR/MD5SUMS | md5sum -c - - else - echo Warning: no MD5 for $filename were found. Hit enter to continue. - read dummy - fi - echo Installing $filename ... - if [ -r $filename.list ] ; then - tr '\n' '\000' < $filename.list | xargs -r0 rm || true - UNLINK $filename.list - rm $filename.list - fi - - tarfail () { echo FAILED $filename ; rm $filename.list ; exit 1 ; } - - case "$filename" in - *.tar.gz) - tar xvzf $filename > $filename.list || tarfail - #rm $filename - ;; - *.tgz) - tar xvzf $filename > $filename.list || tarfail - #rm $filename - ;; - *.tar.bz2) - tar --bzip2 -xvf $filename > $filename.list || tarfail - #rm $filename - ;; - esac - [ -r $filename.bak ] && rm $filename.bak - LINK $filename.list - echo "Installed $filename Succesfully!" - fi -} - -LINK () { - cd $CODECDIR/ - cat $CODECDIR/mplayer_binary_codecs/$1 | while read f ; do - ln -sbf mplayer_binary_codecs/"$f" . - done -} - -UNLINK () { -### FIXME -# cd $CODECDIR -# cat $CODECDIR/mplayer_binary_codecs/$1 | while f do -# ln -sbf mplayer_binary_codecs/"$f" -# done - if which symlinks > /dev/null ; then - symlinks -d $CODECDIR - fi -} - -if [ `whoami` != root ]; then - echo "You must be 'root' to use this script. Login as root first!" - exit 1 -fi - -case "$1" in - install) - if test -x /bin/bzip2 || test -x /usr/bin/bzip2 ; then : ; else - echo You need to install bzip2 - exit 1 - fi - choosemirror - cd $PREFDIR - #if [ ! -r codecs_list ] || find codecs_list -mtime +20 ; then - echo "Getting codecs list" - wget -nv -c -N $MYSITE/codecs_list || true - #fi - - cd $PREFDIR - echo Downloading MD5 sums from main site - [ -r MD5SUMS ] && mv MD5SUMS MD5SUMS.bak - if wget -nv -N http://www.mplayerhq.hu/MPlayer/releases/codecs/MD5SUMS ; then - [ -r MD5SUMS.bak ] && rm MD5SUMS.bak - else - echo "failed" - if [ -r MD5SUMS.bak ] ; then - echo "trying to use backup" - mv MD5SUMS.bak MD5SUMS - fi - fi - - if grep -q "^$dpkgarch" $PREFDIR/codecs_list ; then - egrep -v "^[[:space:]]*(#|$)" $PREFDIR/codecs_list | \ - while read arch url dir file info ; do - if [ "$dpkgarch" = "$arch" ]; then - echo Downloading and installing $file $info... - INSTALL "$url" "$dir" "$file" - fi - done - needlibstd=no - test "$dpkgarch" = "powerpc" && needlibstd=yes - test "$dpkgarch" = "i386" && needlibstd=yes - if test "$needlibstd" = "yes" && ! test -r /usr/lib/libstdc++.so.5 ; then - echo "Warning: you need to install libstdc++ 5 libraries" - echo -n "Do it now? " - read R - case $R in - y*) apt-get install libstdc++5 ;; - *) echo "If you change your mind, use the command" - echo " apt-get install libstdc++5" ;; - esac - fi - else - echo "Sorry, no codecs for your arch '$dpkgarch'. Sorry dude :(" - exit 1 - fi - ;; - - uninstall) - cd $CODECDIR/ - rm -rf mplayer_binary_codecs - #FIXME we need a better clean system - if which symlinks > /dev/null ; then - symlinks -d . - else - echo "please install the package 'symlinks' and run 'symlinks -d $CODECDIR' " - fi - echo "Uninstalled Succesfully!" - ;; - - *) - echo "Usage: {install|uninstall}" - echo "This program will install binary codecs for MPlayer." - exit 1 - ;; -esac - -exit 0 diff --git a/TOOLS/mplayer2_identify.sh b/TOOLS/mpv_identify.sh index 04902124ab..49cec2ce94 100755 --- a/TOOLS/mplayer2_identify.sh +++ b/TOOLS/mpv_identify.sh @@ -3,22 +3,22 @@ # file identification script # # manual usage: -# mplayer2_identify.sh foo.mkv +# mpv_identify.sh foo.mkv # # sh/dash/ksh/bash usage: -# . mplayer2_identify.sh FOO_ foo.mkv +# . mpv_identify.sh FOO_ foo.mkv # will fill properties into variables like FOO_length # # zsh usage: -# mplayer2_identify() { emulate -L sh; . mplayer2_identify.sh "$@"; } -# mplayer2_identify FOO_ foo.mkv +# mpv_identify() { emulate -L sh; . mpv_identify.sh "$@"; } +# mpv_identify FOO_ foo.mkv # will fill properties into variables like FOO_length # # When multiple files were specified, their info will be put into FOO_* for the # first file, FOO_1_* for the second file, FOO_2_* for the third file, etc. case "$0" in - mplayer2_identify.sh|*/mplayer2_identify.sh) + mpv_identify.sh|*/mpv_identify.sh) # we are NOT being sourced case "$1" in '') @@ -90,7 +90,7 @@ __midentify__allprops=" sub " -# TODO add metadata support once mplayer can do it +# TODO add metadata support once mpv can do it __midentify__propstr="X-MIDENTIFY-START:\\n" for __midentify__key in $__midentify__allprops; do @@ -98,7 +98,7 @@ for __midentify__key in $__midentify__allprops; do eval unset $__midentify__nextprefix$__midentify__key done -__midentify__output=`mplayer --playing-msg="$__midentify__propstr" --vo=null --ao=null --frames=0 "$@"` +__midentify__output=`mpv --playing-msg="$__midentify__propstr" --vo=null --ao=null --frames=0 "$@"` __midentify__fileindex=0 __midentify__prefix= while :; do @@ -274,7 +274,7 @@ esac msg_lang_all='' ls po/*.po >/dev/null 2>&1 && msg_lang_all=$(echo po/*.po | sed -e 's:po/\([^[:space:]]*\)\.po:\1:g') -man_lang_all=$(echo DOCS/man/??/mplayer.1 DOCS/man/??_??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g" -e "s:DOCS/man/\(.._..\)/mplayer.1:\1:g") +man_lang_all=$(echo DOCS/man/??/mpv.1 DOCS/man/??_??/mpv.1 | sed -e "s:DOCS/man/\(..\)/mpv.1:\1:g" -e "s:DOCS/man/\(.._..\)/mpv.1:\1:g") doc_lang_all=$(echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g") show_help(){ @@ -288,16 +288,16 @@ Installation directories: --prefix=DIR prefix directory for installation [/usr/local] --bindir=DIR directory for installing binaries [PREFIX/bin] --datadir=DIR directory for installing machine independent - data files (skins, etc) [PREFIX/share/mplayer] + data files (skins, etc) [PREFIX/share/mpv] --mandir=DIR directory for installing man pages [PREFIX/share/man] --confdir=DIR directory for installing configuration files - [PREFIX/etc/mplayer] + [PREFIX/etc/mpv] --localedir=DIR directory for locale tree [PREFIX/share/locale] --libdir=DIR directory for object code libraries [PREFIX/lib] --codecsdir=DIR directory for binary codecs [LIBDIR/codecs] Optional features: - --disable-mplayer disable MPlayer compilation [enable] + --disable-mpv disable mpv compilation [enable] --disable-encoding disable encoding functionality [enable] --enable-termcap use termcap database for key codes [autodetect] --enable-termios use termios database for key codes [autodetect] @@ -397,9 +397,9 @@ Available values for --language-msg are: all $msg_lang_all Miscellaneous options: --enable-cross-compile enable cross-compilation [disable] - --cc=COMPILER C compiler to build MPlayer [gcc] + --cc=COMPILER C compiler to build mpv [gcc] --pkg-config=PKGCONFIG pkg-config to find some libraries [pkg-config] - --windres=WINDRES windres to build MPlayer [windres] + --windres=WINDRES windres to build mpv [windres] --target=PLATFORM target platform (i386-linux, arm-linux, etc) --enable-static build a statically linked binary --with-install=PATH path to a custom install program @@ -413,7 +413,7 @@ Use these options if autodetection fails: --extra-cflags=FLAGS extra CFLAGS --extra-ldflags=FLAGS extra LDFLAGS --extra-libs=FLAGS extra linker flags - --extra-libs-mplayer=FLAGS extra linker flags for MPlayer + --extra-libs-mpv=FLAGS extra linker flags for mpv This configure script is NOT autoconf-based, even though its output is similar. It will try to autodetect all configuration options. If you --enable an option @@ -565,7 +565,7 @@ for ac_option do --extra-libs=*) extra_libs=$(echo $ac_option | cut -d '=' -f 2) ;; - --extra-libs-mplayer=*) + --extra-libs-mpv=*) libs_mplayer=$(echo $ac_option | cut -d '=' -f 2) ;; @@ -621,8 +621,8 @@ for ac_option do --disable-translation) _translation=no ;; --enable-cross-compile) _cross_compile=yes ;; --disable-cross-compile) _cross_compile=no ;; - --enable-mplayer) _mplayer=yes ;; - --disable-mplayer) _mplayer=no ;; + --enable-mpv) _mplayer=yes ;; + --disable-mpv) _mplayer=no ;; --enable-encoding) _encoding=yes ;; --disable-encoding) _encoding=no ;; --enable-x11) _x11=yes ;; @@ -785,9 +785,9 @@ done # Atmos: moved this here, to be correct, if --prefix is specified test -z "$_bindir" && _bindir="$_prefix/bin" -test -z "$_datadir" && _datadir="$_prefix/share/mplayer" +test -z "$_datadir" && _datadir="$_prefix/share/mpv" test -z "$_mandir" && _mandir="$_prefix/share/man" -test -z "$_confdir" && _confdir="$_prefix/etc/mplayer" +test -z "$_confdir" && _confdir="$_prefix/etc/mpv" test -z "$_libdir" && _libdir="$_prefix/lib" test -z "$_localedir" && _localedir="$_prefix/share/locale" @@ -795,7 +795,7 @@ for tmpdir in "$TMPDIR" "$TEMPDIR" "/tmp" ; do test "$tmpdir" && break done -mplayer_tmpdir="$tmpdir/mplayer-configure-$RANDOM-$$" +mplayer_tmpdir="$tmpdir/mpv-configure-$RANDOM-$$" mkdir $mplayer_tmpdir || die "Unable to create tmpdir." TMPLOG="config.log" @@ -1140,7 +1140,7 @@ case "$host_arch" in *) echo "The architecture of your CPU ($host_arch) is not supported by this configure script" - echo "It seems nobody has ported MPlayer to your OS or CPU type yet." + echo "It seems nobody has ported mpv to your OS or CPU type yet." die "unsupported architecture $host_arch" ;; esac # case "$host_arch" in @@ -3677,10 +3677,10 @@ Config files successfully generated by ./configure $configuration ! Video output: $novomodules 'config.h' and 'config.mak' contain your configuration options. -Note: If you alter theses files (for instance CFLAGS) MPlayer may no longer +Note: If you alter theses files (for instance CFLAGS) mpv may no longer compile *** DO NOT REPORT BUGS if you tweak these files *** -'make' will now compile MPlayer and 'make install' will install it. +'make' will now compile mpv and 'make install' will install it. Note: On non-Linux systems you might need to use 'gmake' instead of 'make'. EOF @@ -3699,19 +3699,16 @@ If you used one of these options and experience a compilation or linking failure, make sure you have passed the necessary compiler/linker flags to configure. -If you suspect a bug, please read DOCS/HTML/$language_doc/bugreports.html. - EOF if test "$warn_cflags" = yes; then cat <<EOF -MPlayer compilation will use the CPPFLAGS/CFLAGS/LDFLAGS set by you, -but: +mpv compilation will use the CPPFLAGS/CFLAGS/LDFLAGS set by you, but: *** *** DO NOT REPORT BUGS IF IT DOES NOT COMPILE/WORK! *** *** -It is strongly recommended to let MPlayer choose the correct CFLAGS! +It is strongly recommended to let mpv choose the correct CFLAGS! To do so, execute 'CFLAGS= ./configure <options>' EOF diff --git a/debian/README.debian b/debian/README.debian deleted file mode 100644 index 80874c8de6..0000000000 --- a/debian/README.debian +++ /dev/null @@ -1,16 +0,0 @@ -mplayer for Debian ----------------------- - - Most options are autodetected or configured during compilation thus - users are supposed to build this package themselves. - - Recommended method is running "fakeroot debian/rules binary" in the top - directory - - In case you would like to pass some parameters to ./configure, set variable - DEB_BUILD_CONFIGURE like that: - - eyck@ghost$ DEB_BUILD_CONFIGURE"--enable-streaming" fakeroot debian/rules binary - - -Dariush Pietrzak <eyck@ghost.anime.pl> Sat Jan 5 20:28:23 CET 2002 diff --git a/debian/TODO.Debian b/debian/TODO.Debian deleted file mode 100644 index 8b13789179..0000000000 --- a/debian/TODO.Debian +++ /dev/null @@ -1 +0,0 @@ - diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index ace71aa772..0000000000 --- a/debian/changelog +++ /dev/null @@ -1,209 +0,0 @@ -mplayer (1.0git) unstable; urgency=low - - * change version name to git. - * update standards version to 3.8.2 - - -- Anton Khirnov <wyskas@gmail.com> Sat, 08 Aug 2009 13:15:57 +0200 - -mplayer (1.0svn) unstable; urgency=low - - * change version naming from cvs to svn. - - -- Aurelien Jacobs <aurel@gnuage.org> Tue, 20 Jun 2006 13:02:14 +0200 - -mplayer (1.0cvs) unstable; urgency=low - - * debian/rules: now compiled without --enable-runtime-cpudetection. - If you plan to install the target .deb on a wide variety of machines, - you may want to add that option to the configure command. - - -- Guillaume POIRIER <gpoirier@mplayerhq.hu> Mon, 20 Nov 2005 22:56:40 +0100 - -mplayer (0.90cvs) unstable; urgency=low - - * this is a placeholder message - - -- Gabucino <gabucino@mplayerhq.hu> Fri, 7 Feb 2003 23:43:55 +0100 - -mplayer (0.90rc4-0) unstable; urgency=low - - * new rc-release. - - -- Alex Beregszaszi <alex@naxine.org> Fri, 7 Feb 2003 23:43:55 +0100 - -mplayer (0.90rc3-0) unstable; urgency=low - - * new release. - - -- Gabucino <gabucino@mplayerhq.hu> Mon, 16 Dec 2002 22:03:55 +0100 - -mplayer (0.90rc1-0) unstable; urgency=low - - * new release. - * now compiled with --enable-runtime-cpudetection for safety reasons. - Disable it for slightly better performance, but the package will run only - on the CPU the build machine had. - * updated package description - - -- Gabucino <gabucino@mplayerhq.hu> Sun, 24 Nov 2002 17:01:12 +0100 - -mplayer (0.90pre9-0) unstable; urgency=low - - * new release. - - -- Dariush Pietrzak <eyck@ghost.anime.pl> Mon, 21 Oct 2002 22:30:06 +0200 - -mplayer (0.90pre8-0) unstable; urgency=low - - * new release, fix version, we are not at 0.90, we're still at preX - - -- Dariush Pietrzak <eyck@ghost.anime.pl> Thu, 19 Sep 2002 09:50:43 +0200 - -mplayer (0.90-4) unstable; urgency=low - - * Fix package building by adding BINDIR. - - -- Diego Biurrun <diego@biurrun.de> Wed, 4 Sep 2002 00:49:03 +0200 - -mplayer (0.90-3) unstable; urgency=low - - * Remove configuration files on purge. - - -- Diego Biurrun <diego@biurrun.de> Sun, 1 Sep 2002 11:03:13 +0200 - -mplayer (0.90-2) unstable; urgency=low - - * Use the confdir we compile with in the helper scripts - (/etc/mplayer/mplayer.conf instead of /etc/mplayer). - - -- Diego Biurrun <diego@biurrun.de> Tue, 27 Aug 2002 11:18:50 +0200 - -mplayer (0.90-1) unstable; urgency=low - - * 0.90 release including latest alsa9 fixes - - -- Dariush Pietrzak <eyck@ghost.anime.pl> Wed, 3 Jul 2002 23:32:49 +0200 - -mplayer (0.90pre5-1) unstable; urgency=low - - * rc1 to become 0.90 - - -- Dariush Pietrzak <eyck@ghost.anime.pl> Fri, 7 Jun 2002 15:31:20 +0200 - -mplayer (0.90pre4-1) unstable; urgency=low - - * new pre-release - - -- Dariush Pietrzak <eyck@ghost.anime.pl> Mon, 13 May 2002 08:06:34 +0200 - -mplayer (0.90pre3-1) unstable; urgency=low - - * new pre-release - * gtk bug fixed. - - -- Dariush Pietrzak <eyck@ghost.anime.pl> Tue, 30 Apr 2002 11:32:43 +0200 - -mplayer (0.90pre2-1) unstable; urgency=low - - * new release. - - -- Dariush Pietrzak <eyck@ghost.anime.pl> Sun, 21 Apr 2002 12:49:35 +0200 - -mplayer (0.60-3) unstable; urgency=low - - * install xvidix correctly - - -- Dariush Pietrzak <eyck@ghost.anime.pl> Sun, 17 Mar 2002 16:38:54 +0100 - -mplayer (0.60-2) unstable; urgency=low - - * This is meaningless, just to mark that more then 2 months have passed - since last release and lots of thing in mplayer have changed. - - -- Dariush Pietrzak <eyck@ghost.anime.pl> Thu, 7 Mar 2002 00:34:20 +0100 - -mplayer (0.60-1) unstable; urgency=low - - * Post 0.60 release. - * Changed installation - make install now handles codecs.conf, manpages - * and fontdir, so we now use make install for those. - - -- Dariush Pietrzak <eyck@ghost.anime.pl> Fri, 4 Jan 2002 11:28:54 +0100 - -mplayer (0.60pre2-1) unstable; urgency=low - - * 0.60 pre2 release - - -- Dariush Pietrzak <eyck@ghost.anime.pl> Fri, 28 Dec 2001 22:12:54 +0100 - -mplayer (0.60pre1-1) unstable; urgency=low - - * 0.60 pre-release. - - -- Dariush Pietrzak <eyck@ghost.anime.pl> Tue, 25 Dec 2001 00:47:36 +0100 - -mplayer (0.50-3) unstable; urgency=low - - * debian/rules: improve install routine; will include mencore if it is - built - * debian/control: remove invalid source recommends - * debian/copyright: mention that binary distribution is not allowed - * debian/rules: install /usr/share/mplayer/codecs.conf; this should - probably be a config file - * turn on fbdev option - - -- Adam Di Carlo <aph@debian.org> Sat, 15 Dec 2001 03:33:44 -0500 - -mplayer (0.50-2) unstable; urgency=low - - * gui added to package/menu - - -- Dariush Pietrzak <eyck@ghost.anime.pl> Wed, 7 Nov 2001 11:31:46 +0100 - -mplayer (0.50-1) unstable; urgency=low - - * 0.50 released. - - -- Dariush Pietrzak <eyck@ghost.anime.pl> Fri, 12 Oct 2001 13:26:03 +0200 - -mplayer (0.18-4) unstable; urgency=low - - * Changes to debian packaging suggested Josip Rodin - - -- Dariush Pietrzak <eyck@ghost.forumakad.pl> Wed, 22 Aug 2001 22:40:58 +0200 - -mplayer (0.18-3) unstable; urgency=low - - * fixed templates. - - -- Dariush Pietrzak <eyck@ghost.tinet.pl> Sat, 28 Jul 2001 09:45:45 +0200 - -mplayer (0.18-2) unstable; urgency=low - - * modified debian scripts - - -- Dariush Pietrzak <eyck@ghost.tinet.pl> Fri, 27 Jul 2001 09:25:52 +0200 - -mplayer (0.18-1) unstable; urgency=low - - * lots of changes in mplayer - - -- Dariush Pietrzak <eyck@incubus.ar.lublin.pl> Mon, 25 Jun 2001 15:59:18 +0200 - -mplayer (0.17a-2) unstable; urgency=low - - * mplayer.conf file, automatic menu files update - - -- Dariush Pietrzak <eyck@incubus.ar.lublin.pl> Sun, 20 May 2001 22:50:41 +0200 - -mplayer (0.17a-1) unstable; urgency=low - - * Version change, debian scripts update (rm), maintainer switch - - -- Dariush Pietrzak <eyck@incubus.ar.lublin.pl> Thu, 17 May 2001 13:25:12 +0200 - -mplayer (0.11pre-1) unstable; urgency=low - - * Initial release. - - -- * TeLeNiEkO * <telenieko@telenieko.com> Mon, 26 Feb 2001 12:24:04 +0100 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7f8f011eb7..0000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/debian/control b/debian/control deleted file mode 100644 index fb578fee1c..0000000000 --- a/debian/control +++ /dev/null @@ -1,31 +0,0 @@ -Source: mplayer -Section: misc -Priority: optional -Maintainer: Diego Biurrun <diego@biurrun.de> -Standards-Version: 3.8.2 -Build-Depends: libpng12-dev, zlib1g-dev, x11proto-core-dev, libx11-dev, libxext-dev, libxinerama-dev, libxv-dev, debhelper (>= 7) - -Package: mplayer -Architecture: any -Depends: ${shlibs:Depends},debconf -Description: The Ultimate Movie Player - MPlayer is a movie player for LINUX (runs on many other Unices, and non-x86 - CPUs, see the ports section). It plays most MPEG, VOB, AVI, OGG/OGM, VIVO, - ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files, - supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. You can - watch VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies too (and you don't - need the avifile library at all!). - . - Another big feature of MPlayer is the wide range of supported output drivers. - It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB, but you - can also use GGI and SDL (and this way all their drivers) and some lowlevel - card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64, Permedia3) too! - Most of them supports software or hardware scaling, so you can enjoy movies in - fullscreen. - . - MPlayer supports displaying through some hardware MPEG decoder boards, such as - the DVB and DXR3/Hollywood+. - . - And what about the nice big antialiased shaded subtitles (10 supported types) - with European/ISO 8859-1,2 (Hungarian, English, Czech, etc), Cyrillic, Korean - fonts, and the onscreen display (OSD)? diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 9aec96a800..0000000000 --- a/debian/copyright +++ /dev/null @@ -1,7 +0,0 @@ -This package was debianized by * TeLeNiEkO * telenieko@telenieko.com on -Mon, 26 Feb 2001 12:24:04 +0100. - -Original source can be found at: http://www.mplayerHQ.hu/homepage/ - -Copyrighted by various authors. Licensed under the terms of GNU GPL. -See /usr/share/common-licenses/GPL for details. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 8d1744ab78..0000000000 --- a/debian/dirs +++ /dev/null @@ -1,5 +0,0 @@ -usr/bin -usr/share/man/man1 -usr/share/mplayer -usr/lib/mplayer -usr/share/applications diff --git a/debian/mime b/debian/mime deleted file mode 100644 index 422c07e4b6..0000000000 --- a/debian/mime +++ /dev/null @@ -1,20 +0,0 @@ -application/x-ogg; mplayer %s; description="Ogg Stream" -application/ogg; mplayer %s; description="Ogg Stream" -audio/mpeg; mplayer %s; description="MPEG Audio" -audio/x-mpegurl; mplayer %s; description="Icecast Playlist" -audio/x-ms-wax; mplayer %s; description="Windows Media Audio" -audio/x-ms-wma; mplayer %s; description="Windows Media Audio" -audio/x-pls; mplayer %s; description="MP3 ShoutCast/IceCast Playlist" -audio/x-scpls; mplayer %s; description="Shoutcast Playlist" -audio/x-wav; mplayer %s; description="WAV Audio" -video/mpeg; mplayer %s; description="MPEG Video"; -video/quicktime; mplayer %s; description="Apple QuickTime Video"; -video/x-mpeg; mplayer %s; description="MPEG Video"; -video/x-mpeg2; mplayer %s; description="MPEG-2 Video"; -video/x-msvideo; mplayer %s; description="MS Video (AVI)"; -video/x-ms-afs; mplayer %s; description="Microsoft ASF Video"; -video/x-ms-asf; mplayer %s; description="Microsoft ASF Video"; -video/x-ms-wma; mplayer %s; description="Windows Media Audio"; -video/x-ms-wmv; mplayer %s; description="Windows Media Video"; -video/x-ms-wmx; mplayer %s; description="Windows Media Video"; -video/x-ms-wvx; mplayer %s; description="Windows Media Video"; diff --git a/debian/rules b/debian/rules deleted file mode 100755 index d72bef3434..0000000000 --- a/debian/rules +++ /dev/null @@ -1,108 +0,0 @@ -#!/usr/bin/make -f -# Made with the aid of debmake, by Christoph Lameter, -# based on the sample debian/rules file for GNU hello by Ian Jackson. -#export DH_VERBOSE=1 - -# do not run the actual rules of this makefile in parallel. sub-makes -# can go in parallel -.NOTPARALLEL: - -package := mplayer -prefix := $(shell pwd)/debian/$(package) - -arch := $(shell dpkg --print-architecture) - -# See http://wiki.debian.org/Teams/Dpkg/DebianRules; #465282 and -# https://wiki.ubuntu.com/DistCompilerFlags -CLEAN_ENV=env -u CFLAGS -u CPPFLAGS -u LDFLAGS -u FFLAGS -u CXXFLAGS - -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - MAKEFLAGS += -j$(NUMJOBS) -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - $(checkdir) - # If you plan to install the target .deb on a wide variety of machines, - # you may want to add the "--enable-runtime-cpudetection" option to - # the line below, but beware: the resulting binary will run slower - $(CLEAN_ENV) \ - ./configure --prefix=/usr --confdir=/etc/mplayer $(DEB_BUILD_CONFIGURE) - - touch configure-stamp - -build: configure-stamp build-stamp -build-stamp: - dh_testdir - - # commands to compile the package. - $(CLEAN_ENV) \ - ${MAKE} - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # commands to clean up after the build process. - -$(MAKE) distclean - dh_clean - -# Build architecture-independent files here. -binary-indep: build -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # commands to install the package into debian/<packagename> - $(MAKE) prefix=$(prefix)/usr BINDIR=$(prefix)/usr/bin CONFDIR=$(prefix)/etc/mplayer LIBDIR=$(prefix)/usr/lib DATADIR=$(prefix)/usr/share/mplayer MANDIR=$(prefix)/usr/share/man install - - install -D -m 644 etc/example.conf $(prefix)/etc/mplayer/mplayer.conf - dh_installdocs -X.svn -Xmplayer.1 DOCS/* - dh_installexamples etc/example.conf etc/input.conf - dh_installmime - dh_installinfo - dh_installchangelogs - #ChangeLog - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - - - -#binary-arch: checkroot build -# $(checkdir) -# -rm -rf debian/tmp -# install -d debian/tmp -# cd debian/tmp && install -d `cat ../dirs` - - -# Must have debmake installed for this to work. Otherwise please copy -# /usr/bin/debstd into the debian directory and change debstd to debian/debstd -# debstd -# dpkg-gencontrol -isp -# chown -R root.root debian/tmp -# chmod -R go=rX debian/tmp -# dpkg --build debian/tmp .. - -binary: binary-indep binary-arch - -.PHONY: binary binary-arch binary-indep clean checkroot diff --git a/defaultopts.c b/defaultopts.c index 422841ad65..17cc18a112 100644 --- a/defaultopts.c +++ b/defaultopts.c @@ -14,7 +14,7 @@ void set_default_mplayer_options(struct MPOpts *opts) .softvol = SOFTVOL_AUTO, .softvol_max = 200, .ao_buffersize = -1, - .vo_wintitle = "mplayer - ${filename}", + .vo_wintitle = "mpv - ${filename}", .monitor_pixel_aspect = 1.0, .vo_panscanrange = 1.0, .cursor_autohide_delay = 1000, diff --git a/etc/encoding-example-profiles.conf b/etc/encoding-example-profiles.conf index 1a7ca6342c..f24c11d3ef 100644 --- a/etc/encoding-example-profiles.conf +++ b/etc/encoding-example-profiles.conf @@ -1,5 +1,5 @@ # -# MPlayer configuration file +# mpv configuration file # ######################### @@ -8,10 +8,10 @@ # # Usage of this file: copy/symlink it to a fixed location, and add # include = /path/to/this/encoding-example-profiles.conf -# to your ~/.mplayer/config +# to your ~/.mpv/config # # Then, list all profiles by -# mplayer -profile help | grep enc- +# mpv -profile help | grep enc- # # The following kinds of encoding profiles exist: # enc-a-*: initialize an audio codec including good defaults @@ -26,12 +26,12 @@ # options, or even switch to another codec. # # You can view the exact options a profile sets by -# mplayer -show-profile enc-to-bb-9000 +# mpv -show-profile enc-to-bb-9000 # # Examples: -# mplayer -profile enc-to-dvdpal -o outfile.mpg infile.mkv -# mplayer -profile enc-f-avi -ofps 30 -o outfile.avi infile.mkv -# mplayer -profile enc-v-mpeg4 -ovcopts-add global_quality=7 -profile enc-a-mp3 -oacopts-add b=320k -o outfile.avi infile.mkv +# mpv -profile enc-to-dvdpal -o outfile.mpg infile.mkv +# mpv -profile enc-f-avi -ofps 30 -o outfile.avi infile.mkv +# mpv -profile enc-v-mpeg4 -ovcopts-add global_quality=7 -profile enc-a-mp3 -oacopts-add b=320k -o outfile.avi infile.mkv ################ # audio codecs # diff --git a/etc/example.conf b/etc/example.conf index 588ec00b7e..a68dc39cca 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -1,8 +1,8 @@ # -# MPlayer configuration file +# mpv configuration file # -# Configuration files are read system-wide from /usr/local/etc/mplayer.conf -# and per-user from ~/.mplayer/config, where per-user settings override +# Configuration files are read system-wide from /usr/local/etc/mpv.conf +# and per-user from ~/.mpv/config, where per-user settings override # system-wide settings, all of which are overrriden by the command line. # # The configuration file settings are the same as the command line diff --git a/etc/input.conf b/etc/input.conf index 2dd9fee758..0dec4fa4b0 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -1,16 +1,16 @@ -# MPlayer input control file +# mpv input control file # # You are able to redefine default keyboard/joystick/mouse/LIRC bindings, or # add new ones here. # See DOCS/tech/slave.txt for possible commands that can be bound. -# Also see mplayer -input cmdlist for other possible options. -# The file should be placed in the $HOME/.mplayer directory. +# Also see mpv -input cmdlist for other possible options. +# The file should be placed in the $HOME/.mpv directory. # # If you wish to unbind a key, use key ignore. # e.g. ENTER ignore # # Note that merely removing default key bindings from this file won't remove -# the default bindings mplayer was compiled with, unless +# the default bindings mpv was compiled with, unless # --input=nodefault-bindings # is specified. # diff --git a/etc/mplayer.desktop b/etc/mplayer.desktop deleted file mode 100644 index c7c9648524..0000000000 --- a/etc/mplayer.desktop +++ /dev/null @@ -1,27 +0,0 @@ -[Desktop Entry] -Type=Application -Name=MPlayer -GenericName=Media Player -GenericName[ca]=Reproductor multimèdia -GenericName[de]=Medienwiedergabe -GenericName[fr]=Lecteur multimédia -GenericName[it]=Lettore multimediale -GenericName[ja]=メディアプレーヤー -X-GNOME-FullName=MPlayer Media Player -X-GNOME-FullName[ca]=MPlayer Reproductor multimèdia -X-GNOME-FullName[de]=MPlayer Medienwiedergabe -X-GNOME-FullName[fr]=MPlayer Lecteur multimédia -X-GNOME-FullName[it]=MPlayer Lettore multimediale -X-GNOME-FullName[ja]=MPlayer メディアプレーヤー -Comment=Play movies and songs -Comment[ca]=Reproduïu vídeos i cançons -Comment[de]=Filme und Musik wiedergeben -Comment[fr]=Lit les films et musiques -Comment[it]=Riproduce filmati e musica -Comment[ja]=動画や音声のファイルを再生します -Icon=mplayer -TryExec=gmplayer -Exec=gmplayer %F -Terminal=false -Categories=GTK;AudioVideo;Audio;Video;Player;TV; -MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-theora;video/x-matroska;video/3gpp;application/x-flash-video; diff --git a/input/input.c b/input/input.c index 54be75c439..1a4b66be8d 100644 --- a/input/input.c +++ b/input/input.c @@ -1612,7 +1612,7 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf) #ifdef CONFIG_LIRCC if (input_conf->use_lircc) { - int fd = lircc_init("mplayer", NULL); + int fd = lircc_init("mpv", NULL); if (fd >= 0) mp_input_add_cmd_fd(ictx, fd, 1, NULL, lircc_cleanup); } diff --git a/input/lirc.c b/input/lirc.c index 23454d6aee..fd64beb479 100644 --- a/input/lirc.c +++ b/input/lirc.c @@ -41,7 +41,7 @@ mp_input_lirc_init(void) { int mode; mp_tmsg(MSGT_LIRC,MSGL_V,"Setting up LIRC support...\n"); - if((lirc_sock=lirc_init("mplayer",0))==-1){ + if((lirc_sock=lirc_init("mpv",0))==-1){ mp_tmsg(MSGT_LIRC,MSGL_V,"Failed to open LIRC support. You will not be able to use your remote control.\n"); return -1; } diff --git a/libaf/af_export.c b/libaf/af_export.c index 193271b45e..b5e5a884c0 100644 --- a/libaf/af_export.c +++ b/libaf/af_export.c @@ -41,8 +41,8 @@ #include "path.h" #define DEF_SZ 512 // default buffer size (in samples) -#define SHARED_FILE "mplayer-af_export" /* default file name - (relative to ~/.mplayer/ */ +#define SHARED_FILE "mpv-af_export" /* default file name + (relative to ~/.mpv/ */ #define SIZE_HEADER (2 * sizeof(int) + sizeof(unsigned long long)) diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index ba665d9b73..e0322c70d5 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -269,7 +269,7 @@ static void print_help (void) { mp_tmsg (MSGT_AO, MSGL_FATAL, "\n[AO_ALSA] -ao alsa commandline help:\n"\ - "[AO_ALSA] Example: mplayer -ao alsa:device=hw=0.3\n"\ + "[AO_ALSA] Example: mpv -ao alsa:device=hw=0.3\n"\ "[AO_ALSA] Sets first card fourth hardware device.\n\n"\ "[AO_ALSA] Options:\n"\ "[AO_ALSA] noblock\n"\ diff --git a/libao2/ao_coreaudio.c b/libao2/ao_coreaudio.c index e78973ec04..e0d2d6d26c 100644 --- a/libao2/ao_coreaudio.c +++ b/libao2/ao_coreaudio.c @@ -378,7 +378,7 @@ static void print_help(void) mp_msg(MSGT_AO, MSGL_FATAL, "\n-ao coreaudio commandline help:\n" - "Example: mplayer -ao coreaudio:device_id=266\n" + "Example: mpv -ao coreaudio:device_id=266\n" " open Core Audio with output device ID 266.\n" "\nOptions:\n" " device_id\n" diff --git a/libao2/ao_dsound.c b/libao2/ao_dsound.c index a72ed32022..4ef7029c29 100644 --- a/libao2/ao_dsound.c +++ b/libao2/ao_dsound.c @@ -184,7 +184,7 @@ static void print_help(void) { mp_msg(MSGT_AO, MSGL_FATAL, "\n-ao dsound commandline help:\n" - "Example: mplayer -ao dsound:device=1\n" + "Example: mpv -ao dsound:device=1\n" " sets 1st device\n" "\nOptions:\n" " device=<device-number>\n" diff --git a/libao2/ao_jack.c b/libao2/ao_jack.c index 5a80bb34bb..b30f99a14e 100644 --- a/libao2/ao_jack.c +++ b/libao2/ao_jack.c @@ -188,8 +188,8 @@ static void print_help (void) { mp_msg (MSGT_AO, MSGL_FATAL, "\n-ao jack commandline help:\n" - "Example: mplayer -ao jack:port=myout\n" - " connects MPlayer to the jack ports named myout\n" + "Example: mpv -ao jack:port=myout\n" + " connects mpv to the jack ports named myout\n" "\nOptions:\n" " port=<port name>\n" " Connects to the given ports instead of the default physical ones\n" @@ -228,7 +228,7 @@ static int init(int rate, int channels, int format, int flags) { } if (!client_name) { client_name = malloc(40); - sprintf(client_name, "MPlayer [%d]", getpid()); + sprintf(client_name, "mpv [%d]", getpid()); } if (!autostart) open_options |= JackNoStartServer; diff --git a/libao2/ao_openal.c b/libao2/ao_openal.c index 8245f4f1d7..e5a40a769d 100644 --- a/libao2/ao_openal.c +++ b/libao2/ao_openal.c @@ -88,7 +88,7 @@ static int control(int cmd, void *arg) { static void print_help(void) { mp_msg(MSGT_AO, MSGL_FATAL, "\n-ao openal commandline help:\n" - "Example: mplayer -ao openal:device=subdevice\n" + "Example: mpv -ao openal:device=subdevice\n" "\nOptions:\n" " device=subdevice\n" " Audio device OpenAL should use. Devices can be listed\n" diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c index a8d06aee00..a79361a6a8 100644 --- a/libao2/ao_oss.c +++ b/libao2/ao_oss.c @@ -403,7 +403,7 @@ ac3_retry: } free(data); if(ao_data.buffersize==0){ - mp_tmsg(MSGT_AO,MSGL_ERR,"[AO OSS]\n *** Your audio driver DOES NOT support select() ***\n Recompile MPlayer with #undef HAVE_AUDIO_SELECT in config.h !\n\n"); + mp_tmsg(MSGT_AO,MSGL_ERR,"[AO OSS]\n *** Your audio driver DOES NOT support select() ***\n Recompile mpv with #undef HAVE_AUDIO_SELECT in config.h !\n\n"); return 0; } #endif diff --git a/libao2/ao_portaudio.c b/libao2/ao_portaudio.c index 00016ac3f3..36b08f8288 100644 --- a/libao2/ao_portaudio.c +++ b/libao2/ao_portaudio.c @@ -68,7 +68,7 @@ static void print_help(void) { mp_msg(MSGT_AO, MSGL_FATAL, "\n-ao portaudio commandline help:\n" - "Example: mplayer -ao portaudio:device=subdevice\n" + "Example: mpv -ao portaudio:device=subdevice\n" "\nOptions:\n" " device=subdevice\n" " Audio device PortAudio should use. Devices can be listed\n" diff --git a/libao2/ao_pulse.c b/libao2/ao_pulse.c index b8e4f1cbdd..1d2ebc5281 100644 --- a/libao2/ao_pulse.c +++ b/libao2/ao_pulse.c @@ -32,7 +32,7 @@ #include "audio_out.h" #include "input/input.h" -#define PULSE_CLIENT_NAME "mplayer2" +#define PULSE_CLIENT_NAME "mpv" #define VOL_PA2MP(v) ((v) * 100 / PA_VOLUME_UI_MAX) #define VOL_MP2PA(v) ((v) * PA_VOLUME_UI_MAX / 100) diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index f1e41f5f6e..c93d67180e 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -470,7 +470,7 @@ static void parse_trackencodings(struct demuxer *demuxer, else if (e.comp_algo == 0) { mp_tmsg(MSGT_DEMUX, MSGL_WARN, "[mkv] Track %u was compressed with zlib " - "but mplayer has not been compiled\n" + "but mpv has not been compiled\n" "[mkv] with support for zlib compression. " "Skipping track.\n", track->tnum); diff --git a/libvo/vo_caca.c b/libvo/vo_caca.c index 2dfaa2a90f..caf84c6e5f 100644 --- a/libvo/vo_caca.c +++ b/libvo/vo_caca.c @@ -351,7 +351,7 @@ static int preinit(struct vo *vo, const char *arg) return ENOSYS; } - caca_set_display_title(display, "MPlayer"); + caca_set_display_title(display, "mpv"); return 0; } diff --git a/libvo/vo_opengl.c b/libvo/vo_opengl.c index a9bd5f67e8..f5c04c03d8 100644 --- a/libvo/vo_opengl.c +++ b/libvo/vo_opengl.c @@ -2045,7 +2045,7 @@ static struct bstr load_file(struct gl_priv *p, void *talloc_ctx, return res; } -#define LUT3D_CACHE_HEADER "mplayer2 3dlut cache 1.0\n" +#define LUT3D_CACHE_HEADER "mpv 3dlut cache 1.0\n" static bool load_icc(struct gl_priv *p, const char *icc_file, const char *icc_cache, int icc_intent, @@ -2482,7 +2482,7 @@ const struct vo_driver video_out_opengl_hq = { static const char help_text[] = "\n--vo=opengl command line help:\n" -"Example: mplayer --vo=opengl:scale-sep:lscale=lanczos2\n" +"Example: mpv --vo=opengl:scale-sep:lscale=lanczos2\n" "\nOptions:\n" " lscale=<filter>\n" " Set the scaling filter. Possible choices:\n" @@ -2521,7 +2521,7 @@ static const char help_text[] = " sparodic and temporary image corruption.\n" " dither-depth=<n>\n" " Positive non-zero values select the target bit depth.\n" -" -1: Disable any dithering done by mplayer.\n" +" -1: Disable any dithering done by mpv.\n" " 0: Automatic selection. If output bit depth can't be detected,\n" " 8 bits per component are assumed.\n" " 8: Dither to 8 bit output.\n" diff --git a/libvo/vo_opengl_old.c b/libvo/vo_opengl_old.c index e8cdd47172..d3a9c0e170 100644 --- a/libvo/vo_opengl_old.c +++ b/libvo/vo_opengl_old.c @@ -1231,7 +1231,7 @@ static int preinit(struct vo *vo, const char *arg) if (subopt_parse(arg, subopts) != 0) { mp_msg(MSGT_VO, MSGL_FATAL, "\n-vo opengl_old command line help:\n" - "Example: mplayer -vo opengl_old:slice-height=4\n" + "Example: mpv -vo opengl_old:slice-height=4\n" "\nOptions:\n" " nomanyfmts\n" " Disable extended color formats for OpenGL 1.2 and later\n" diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 65581dac35..42ddde890a 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -689,13 +689,13 @@ static int preinit(struct vo *vo, const char *arg) mp_tmsg(MSGT_VO, MSGL_ERR, "[VO_XV] Could not find free Xvideo port - maybe another process is already\n"\ "[VO_XV] using it. Close all video applications, and try again. If that does\n"\ - "[VO_XV] not help, see 'mplayer -vo help' for other (non-xv) video out drivers.\n"); + "[VO_XV] not help, see 'mpv -vo help' for other (non-xv) video out drivers.\n"); else mp_tmsg(MSGT_VO, MSGL_ERR, "[VO_XV] It seems there is no Xvideo support for your video card available.\n"\ "[VO_XV] Run 'xvinfo' to verify its Xv support and read\n"\ "[VO_XV] DOCS/HTML/en/video.html#xv!\n"\ - "[VO_XV] See 'mplayer -vo help' for other (non-xv) video out drivers.\n"\ + "[VO_XV] See 'mpv -vo help' for other (non-xv) video out drivers.\n"\ "[VO_XV] Try -vo x11.\n"); goto error; } diff --git a/libvo/w32_common.c b/libvo/w32_common.c index ebe17bd154..6136730fbd 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -35,7 +35,7 @@ #define WIN_ID_TO_HWND(x) ((HWND)(uint32_t)(x)) -static const wchar_t classname[] = L"mplayer2"; +static const wchar_t classname[] = L"mpv"; static const struct mp_keymap vk_map[] = { // special keys diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 39c876ce3e..06ffcaef54 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -718,7 +718,7 @@ void vo_x11_classhint(struct vo *vo, Window window, const char *name) pid_t pid = getpid(); wmClass.res_name = opts->vo_winname ? opts->vo_winname : (char *)name; - wmClass.res_class = "mplayer2"; + wmClass.res_class = "mpv"; XSetClassHint(x11->display, window, &wmClass); XChangeProperty(x11->display, window, x11->XA_NET_WM_PID, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &pid, 1); @@ -1633,7 +1633,7 @@ void vo_x11_selectinput_witherr(Display * display, Window w, if (selectinput_err) { mp_msg(MSGT_VO, MSGL_ERR, - "X11 error: MPlayer discards mouse control (reconfiguring)\n"); + "X11 error: mpv discards mouse control (reconfiguring)\n"); XSelectInput(display, w, event_mask & (~ @@ -2163,20 +2163,20 @@ static void vo_xv_print_ck_info(struct vo_x11_state *x11) if ( x11->xv_ck_info.method == CK_METHOD_AUTOPAINT ) { mp_msg( MSGT_VO, MSGL_V, - "Ignoring colorkey from MPlayer (0x%06lx).\n", + "Ignoring colorkey from mpv (0x%06lx).\n", x11->xv_colorkey ); } else { mp_msg( MSGT_VO, MSGL_V, - "Using colorkey from MPlayer (0x%06lx)." + "Using colorkey from mpv (0x%06lx)." " Use -colorkey to change.\n", x11->xv_colorkey ); } break; case CK_SRC_SET: mp_msg( MSGT_VO, MSGL_V, - "Setting and using colorkey from MPlayer (0x%06lx)." + "Setting and using colorkey from mpv (0x%06lx)." " Use -colorkey to change.\n", x11->xv_colorkey ); break; @@ -80,19 +80,19 @@ void mp_msg_init(void){ stdoutAttrs = cinfo.wAttributes; #endif int i; - char *env = getenv("MPLAYER_VERBOSE"); + char *env = getenv("MPV_VERBOSE"); if (env) verbose = atoi(env); for(i=0;i<MSGT_MAX;i++) mp_msg_levels[i] = -2; mp_msg_cancolor = isatty(fileno(stdout)); mp_msg_levels[MSGT_IDENTIFY] = -1; // no -identify output by default #ifdef CONFIG_TRANSLATION - textdomain("mplayer"); - char *localedir = getenv("MPLAYER_LOCALEDIR"); + textdomain("mpv"); + char *localedir = getenv("MPV_LOCALEDIR"); if (localedir == NULL && strlen(MPLAYER_LOCALEDIR)) localedir = MPLAYER_LOCALEDIR; - bindtextdomain("mplayer", localedir); - bind_textdomain_codeset("mplayer", "UTF-8"); + bindtextdomain("mpv", localedir); + bind_textdomain_codeset("mpv", "UTF-8"); #endif } @@ -161,7 +161,7 @@ static int max_framesize = 0; #include "defaultopts.h" static const char help_text[] = _( -"Usage: mplayer [options] [url|path/]filename\n" +"Usage: mpv [options] [url|path/]filename\n" "\n" "Basic options: (complete list in the man page)\n" " --ss=<position> seek to given (seconds or hh:mm:ss) position\n" @@ -772,7 +772,7 @@ static bool parse_cfgfiles(struct MPContext *mpctx, m_config_t *conf) char *conffile; int conffile_fd; if (!(opts->noconfig & 2) && - m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mplayer.conf") < 0) + m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mpv.conf") < 0) return false; if ((conffile = get_path("")) == NULL) mp_tmsg(MSGT_CPLAYER, MSGL_WARN, "Cannot find HOME directory.\n"); @@ -891,7 +891,7 @@ static void load_per_file_config(m_config_t *conf, const char * const file) if (use_filedir_conf) { char dircfg[MP_PATH_MAX]; strcpy(dircfg, cfg); - strcpy(dircfg + (name - cfg), "mplayer.conf"); + strcpy(dircfg + (name - cfg), "mpv.conf"); try_load_config(conf, dircfg); if (try_load_config(conf, cfg)) @@ -3863,7 +3863,7 @@ static void play_current_file(struct MPContext *mpctx) if (mpctx->file_format == DEMUXER_TYPE_PLAYLIST) { mp_msg(MSGT_CPLAYER, MSGL_ERR, "\nThis looks like a playlist, but " "playlist support will not be used automatically.\n" - "MPlayer's playlist code is unsafe and should only be used with " + "mpv's playlist code is unsafe and should only be used with " "trusted sources.\nPlayback will probably fail.\n\n"); #if 0 // Handle playlist @@ -4079,7 +4079,7 @@ goto_enable_cache: if (end_at.type == END_AT_SIZE) { mp_tmsg(MSGT_CPLAYER, MSGL_WARN, - "Option -endpos in MPlayer does not yet support size units.\n"); + "Option -endpos in mpv does not yet support size units.\n"); end_at.type = END_AT_NONE; } @@ -4176,7 +4176,7 @@ static void play_files(struct MPContext *mpctx) static void print_version(int always) { mp_msg(MSGT_CPLAYER, always ? MSGL_INFO : MSGL_V, - "%s (C) 2000-2012\n", mplayer_version); + "%s (C) 2000-2012 mpv/MPlayer/mplayer2 projects\n", mplayer_version); } static bool handle_help_options(struct MPContext *mpctx) @@ -4275,7 +4275,7 @@ static void detach_ptw32(void) static void osdep_preinit(int *p_argc, char ***p_argv) { - char *enable_talloc = getenv("MPLAYER_LEAK_REPORT"); + char *enable_talloc = getenv("MPV_LEAK_REPORT"); if (*p_argc > 1 && (strcmp((*p_argv)[1], "-leak-report") == 0 || strcmp((*p_argv)[1], "--leak-report") == 0)) enable_talloc = "1"; diff --git a/osdep/cocoa_events.m b/osdep/cocoa_events.m index ba09c13cad..e6d941d19b 100644 --- a/osdep/cocoa_events.m +++ b/osdep/cocoa_events.m @@ -106,7 +106,7 @@ void cocoa_events_init(struct input_ctx *ictx, *p = (struct priv){ .is_runloop_polling = NO, .read_all_fd_events = read_all_fd_events, - .select_queue = dispatch_queue_create("org.mplayer2.select_queue", + .select_queue = dispatch_queue_create("org.mpv.select_queue", NULL), }; } diff --git a/osdep/macosx_finder_args.m b/osdep/macosx_finder_args.m index 56d314c100..a3eae773fd 100644 --- a/osdep/macosx_finder_args.m +++ b/osdep/macosx_finder_args.m @@ -81,7 +81,7 @@ bool macosx_finder_args(m_config_t *config, struct playlist *pl_files, int argc, char **argv) { if (argc==1 && psn_matches_current_process(argv[0])) { - macosx_redirect_output_to_logfile("mplayer2"); + macosx_redirect_output_to_logfile("mpv"); m_config_set_option0(config, "quiet", NULL); macosx_wait_fileopen_events(); } diff --git a/osdep/mplayer.exe.manifest b/osdep/mplayer.exe.manifest index 7a0102dc3f..c924377c4b 100644 --- a/osdep/mplayer.exe.manifest +++ b/osdep/mplayer.exe.manifest @@ -3,10 +3,10 @@ <assemblyIdentity version="0.0.9.0" processorArchitecture="*" - name="MPlayer - The Movie Player" + name="mpv - The Movie Player" type="win32" /> - <description>MPlayer - The Movie Player</description> + <description>mpv - The Movie Player</description> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> <security> <requestedPrivileges> diff --git a/osdep/mplayer.rc b/osdep/mplayer.rc index fe70aa871f..ec04346f9d 100644 --- a/osdep/mplayer.rc +++ b/osdep/mplayer.rc @@ -31,14 +31,14 @@ FILETYPE VFT_APP { BLOCK "000004b0" // LANG_NEUTRAL,UNICODE_CP { - VALUE "Comments","mplayer2 is distributed under the terms of the GNU General Public License Version 3. Source code is available at http://www.mplayer2.org\000" + VALUE "Comments","mpv is distributed under the terms of the GNU General Public License Version 3.\000" VALUE "CompanyName", "\000" - VALUE "FileDescription", "mplayer2 - Movie Player\000" + VALUE "FileDescription", "mpv - Movie Player\000" VALUE "FileVersion",VERSION - VALUE "LegalCopyright", " (C) 2000-2012 MPlayer Team\000" + VALUE "LegalCopyright", " (C) 2000-2012 MPlayer Team and others\000" //VALUE "LegalTrademarks"," \000"; - VALUE "OriginalFilename", "mplayer.exe\000" - VALUE "ProductName", "mplayer2 - The Movie Player\000" + VALUE "OriginalFilename", "mpv.exe\000" + VALUE "ProductName", "mpv - The Movie Player\000" VALUE "ProductVersion",VERSION //VALUE "SpecialBuild","\000" } @@ -52,4 +52,4 @@ FILETYPE VFT_APP IDI_ICON1 ICON DISCARDABLE "etc/mplayer.ico" // for some reason RT_MANIFEST does not work -1 24 "mplayer.exe.manifest" +1 24 "mpv.exe.manifest" @@ -52,9 +52,9 @@ char *get_path(const char *filename){ char *homedir; char *buff; #ifdef __MINGW32__ - static char *config_dir = "/mplayer"; + static char *config_dir = "/mpv"; #else - static char *config_dir = "/.mplayer"; + static char *config_dir = "/.mpv"; #endif #if defined(__MINGW32__) || defined(__CYGWIN__) char exedir[260]; @@ -69,7 +69,7 @@ char *get_path(const char *filename){ char *bdl_url_path = NULL; #endif - if ((homedir = getenv("MPLAYER_HOME")) != NULL) + if ((homedir = getenv("MPV_HOME")) != NULL) config_dir = ""; else if ((homedir = getenv("HOME")) == NULL) #if defined(__MINGW32__) || defined(__CYGWIN__) diff --git a/rpm/mplayer-codecs.spec b/rpm/mplayer-codecs.spec deleted file mode 100644 index 486882cd83..0000000000 --- a/rpm/mplayer-codecs.spec +++ /dev/null @@ -1,318 +0,0 @@ -%define _codecsdir %{_libdir}/codecs - -# don't try to strip or compress anything -%define __spec_install_post %{nil} -%define debug_package %{nil} - -%define i386_ver 20100303 -%define ppc_ver 20061022 -%define alpha_ver 20061028 -%define x86_64_ver 20071007 - -%define ver %{expand:%{%{_target_cpu}_ver}} - -Summary: MPlayer essential binary codecs package -Name: mplayer-codecs -Version: %{ver} -Release: 1 -URL: http://www.mplayerhq.hu/MPlayer/releases/codecs/ -Group: Applications/Multimedia -Source0: http://www.mplayerhq.hu/MPlayer/releases/codecs/all-%{i386_ver}.tar.bz2 -Source1: http://www.mplayerhq.hu/MPlayer/releases/codecs/all-alpha-%{alpha_ver}.tar.bz2 -Source2: http://www.mplayerhq.hu/MPlayer/releases/codecs/all-ppc-%{ppc_ver}.tar.bz2 -Source3: http://www.mplayerhq.hu/MPlayer/releases/codecs/essential-amd64-%{x86_64_ver}.tar.bz2 -License: Unknown -ExclusiveArch: i386 ppc alpha x86_64 -%ifarch i386 -Provides: w32codec = %{version}-%{release} -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) - -%description -All-in-one essential end-user package. Contains binary codecs that have -no native open-source decoder currently. - -%package extra -Group: Applications/Multimedia -Summary: MPlayer optional binary codecs package - -%description extra -MPlayer optional codecs package. Contains additional binary codecs -supported by MPlayer. - -%prep -%ifarch i386 -%setup -q -c %{name}-%{version} -%endif -%ifarch alpha -%setup -q -c %{name}-%{version} -T -a 1 -%endif -%ifarch ppc -%setup -q -c %{name}-%{version} -T -a 2 -%endif -%ifarch x86_64 -%setup -q -c %{name}-%{version} -T -a 3 -%endif - -%build -# nothing to build - -%install -rm -rf $RPM_BUILD_ROOT - -install -d $RPM_BUILD_ROOT%{_codecsdir} -%ifarch i386 -install -p all-%{version}/* $RPM_BUILD_ROOT%{_codecsdir}/ -%endif -%ifarch alpha -install -p all-alpha-%{alpha_ver}/* $RPM_BUILD_ROOT%{_codecsdir}/ -%endif -%ifarch ppc -install -p all-ppc-%{ppc_ver}/* $RPM_BUILD_ROOT%{_codecsdir}/ -%endif -%ifarch x86_64 -install -p essential-amd64-%{x86_64_ver}/* $RPM_BUILD_ROOT%{_codecsdir}/ -%endif -rm -f $RPM_BUILD_ROOT%{_codecsdir}/README - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(0644,root,root,0755) -%ifarch i386 -%doc all-%{i386_ver}/README -%{_codecsdir}/acelpdec.ax -%{_codecsdir}/alf2cd.acm -%{_codecsdir}/aslcodec_dshow.dll -%{_codecsdir}/atrac3.acm -%{_codecsdir}/atrc.so.6.0 -%{_codecsdir}/AvidQTAVUICodec.qtx -%{_codecsdir}/BeHereiVideo.qtx -%{_codecsdir}/CLRVIDDC.DLL -%{_codecsdir}/clrviddd.dll -%{_codecsdir}/cook.so -%{_codecsdir}/CtWbJpg.DLL -%{_codecsdir}/DECVW_32.DLL -%{_codecsdir}/drvc.so -%{_codecsdir}/dspr.so.6.0 -%{_codecsdir}/frapsvid.dll -%{_codecsdir}/iac25_32.ax -%{_codecsdir}/icmw_32.dll -%{_codecsdir}/imc32.acm -%{_codecsdir}/ir41_32.dll -%{_codecsdir}/ir50_32.dll -%{_codecsdir}/ivvideo.dll -%{_codecsdir}/jp2avi.dll -%{_codecsdir}/LCMW2.dll -%{_codecsdir}/LCODCCMW2E.dll -%{_codecsdir}/lhacm.acm -%{_codecsdir}/lsvxdec.dll -%{_codecsdir}/m3jp2k32.dll -%{_codecsdir}/mi-sc4.acm -%{_codecsdir}/msh261.drv -%{_codecsdir}/msms001.vwp -%{_codecsdir}/msscds32.ax -%{_codecsdir}/nsrt2432.acm -%{_codecsdir}/qpeg32.dll -%{_codecsdir}/qtmlClient.dll -%{_codecsdir}/QuickTimeEssentials.qtx -%{_codecsdir}/QuickTimeInternetExtras.qtx -%{_codecsdir}/QuickTime.qts -%{_codecsdir}/rt32dcmp.dll -%{_codecsdir}/sipr.so.6.0 -%{_codecsdir}/tm20dec.ax -%{_codecsdir}/tokf.so.6.0 -%{_codecsdir}/tokr.so.6.0 -%{_codecsdir}/tsd32.dll -%{_codecsdir}/tssoft32.acm -%{_codecsdir}/tvqdec.dll -%{_codecsdir}/VDODEC32.dll -%{_codecsdir}/vdowave.drv -%{_codecsdir}/vid_3ivX.xa -%{_codecsdir}/ViVD2.dll -%{_codecsdir}/vivog723.acm -%{_codecsdir}/vmnc.dll -%{_codecsdir}/voxmsdec.ax -%{_codecsdir}/vp4vfw.dll -%{_codecsdir}/vp5vfw.dll -%{_codecsdir}/vp6vfw.dll -%{_codecsdir}/vp7vfw.dll -%{_codecsdir}/vssh264core.dll -%{_codecsdir}/vssh264dec.dll -%{_codecsdir}/vssh264.dll -%{_codecsdir}/vsshdsd.dll -%{_codecsdir}/vsslight.dll -%{_codecsdir}/vsswlt.dll -%{_codecsdir}/wma9dmod.dll -%{_codecsdir}/wmadmod.dll -%{_codecsdir}/wmsdmod.dll -%{_codecsdir}/wmspdmod.dll -%{_codecsdir}/wmv9dmod.dll -%{_codecsdir}/wmvadvd.dll -%{_codecsdir}/wmvdmod.dll -%{_codecsdir}/wnvwinx.dll -%{_codecsdir}/wvc1dmod.dll -%{_codecsdir}/xanlib.dll -%endif -%ifarch alpha -%doc all-alpha-%{alpha_ver}/README -%endif -%ifarch alpha ppc -%{_codecsdir}/28_8.so.6.0 -%{_codecsdir}/atrc.so.6.0 -%{_codecsdir}/cook.so.6.0 -%{_codecsdir}/ddnt.so.6.0 -%{_codecsdir}/dnet.so.6.0 -%{_codecsdir}/drv2.so.6.0 -%{_codecsdir}/dspr.so.6.0 -%{_codecsdir}/sipr.so.6.0 -%{_codecsdir}/tokr.so.6.0 -%endif -%ifarch ppc -%doc all-ppc-%{ppc_ver}/README -%{_codecsdir}/vid_iv41.xa -%{_codecsdir}/vid_iv50.xa -%endif -%ifarch x86_64 -%doc essential-amd64-%{x86_64_ver}/README -%{_codecsdir}/cook.so -%{_codecsdir}/drvc.so -%{_codecsdir}/sipr.so -%endif - -%files extra -%ifarch i386 -%defattr(0644,root,root,0755) -%{_codecsdir}/ACDV.dll -%{_codecsdir}/ADV601.dll -%{_codecsdir}/aoxdxipl.ax -%{_codecsdir}/aslcodec_vfw.dll -%{_codecsdir}/asusasv2.dll -%{_codecsdir}/asusasvd.dll -%{_codecsdir}/ativcr2.dll -%{_codecsdir}/avimszh.dll -%{_codecsdir}/avizlib.dll -%{_codecsdir}/blox.dll -%{_codecsdir}/BTVVC32.DRV -%{_codecsdir}/bw10.dll -%{_codecsdir}/camfc.dll -%{_codecsdir}/cinedec.ax -%{_codecsdir}/cinevfw.dll -%{_codecsdir}/CineWave.qtx -%{_codecsdir}/cook.so.6.0 -%{_codecsdir}/ctadp32.acm -%{_codecsdir}/ddnt.so.6.0 -%{_codecsdir}/decvdo.dll -%{_codecsdir}/divx.dll -%{_codecsdir}/divx_c32.ax -%{_codecsdir}/divxa32.acm -%{_codecsdir}/divxc32.dll -%{_codecsdir}/divxdec.ax -%{_codecsdir}/dnet.so.6.0 -%{_codecsdir}/drv2.so.6.0 -%{_codecsdir}/drv3.so.6.0 -%{_codecsdir}/drv4.so.6.0 -%{_codecsdir}/DVACM.acm -%{_codecsdir}/fmcodec.DLL -%{_codecsdir}/G2M.dll -%{_codecsdir}/GeoCodec.dll -%{_codecsdir}/GXAMP4.dll -%{_codecsdir}/huffyuv.dll -%{_codecsdir}/i263_32.drv -%{_codecsdir}/iccvid.dll -%{_codecsdir}/imaadp32.acm -%{_codecsdir}/ir32_32.dll -%{_codecsdir}/kdvyuv8.dll -%{_codecsdir}/KGV1-VFW.dll -%{_codecsdir}/LCodcCMP.dll -%{_codecsdir}/l3codeca.acm -%{_codecsdir}/l3codecx.ax -%{_codecsdir}/m3jpeg32.dll -%{_codecsdir}/m3jpegdec.ax -%{_codecsdir}/mcdvd_32.dll -%{_codecsdir}/mcmjpg32.dll -%{_codecsdir}/MLZCodec.dll -%{_codecsdir}/mpg4c32.dll -%{_codecsdir}/mpg4ds32.ax -%{_codecsdir}/msadp32.acm -%{_codecsdir}/msg711.acm -%{_codecsdir}/msgsm32.acm -%{_codecsdir}/msnaudio.acm -%{_codecsdir}/msrle32.dll -%{_codecsdir}/msvidc32.dll -%{_codecsdir}/MVCodec.dll -%{_codecsdir}/mvoice.vwp -%{_codecsdir}/mvoiced.vwp -%{_codecsdir}/Nsgsm32.acm -%{_codecsdir}/Nstsp32.acm -%{_codecsdir}/nsvideo.dll -%{_codecsdir}/NuB2.dll -%{_codecsdir}/nuvision.ax -%{_codecsdir}/pclepim1.dll -%{_codecsdir}/qdv.dll -%{_codecsdir}/scg726.acm -%{_codecsdir}/SCLS.DLL -%{_codecsdir}/scrvid.dll -%{_codecsdir}/Sif1Dec.ax -%{_codecsdir}/Sif1_vfw.dll -%{_codecsdir}/smcelp32.acm -%{_codecsdir}/SN4Codec.dll -%{_codecsdir}/sp4x_32.dll -%{_codecsdir}/sp5x_32.dll -%{_codecsdir}/tm2Xdec.ax -%{_codecsdir}/tm2x.dll -%{_codecsdir}/TRICDC32.DRV -%{_codecsdir}/tsccvid.dll -%{_codecsdir}/ubv263d+.ax -%{_codecsdir}/ubvmp4d.dll -%{_codecsdir}/ultimo.dll -%{_codecsdir}/vdo32_30.drv -%{_codecsdir}/vdowave2.acm -%{_codecsdir}/vdowave.acm -%{_codecsdir}/VFCodec.dll -%{_codecsdir}/vgpix32d.dll -%{_codecsdir}/vid_cvid.xa -%{_codecsdir}/vid_cyuv.xa -%{_codecsdir}/vid_h261.xa -%{_codecsdir}/vid_h263.xa -%{_codecsdir}/vid_iv32.xa -%{_codecsdir}/vid_iv41.xa -%{_codecsdir}/vid_iv50.xa -%{_codecsdir}/voxmvdec.ax -%{_codecsdir}/vp31vfw.dll -%{_codecsdir}/WavCWAIP.dll -%{_codecsdir}/wavelet.dll -%{_codecsdir}/WAVLOR.DLL -%{_codecsdir}/WCMV.dll -%{_codecsdir}/wmv8ds32.ax -%{_codecsdir}/wmvds32.ax -%{_codecsdir}/wnvplay1.dll -%{_codecsdir}/wtvc.DLL -%{_codecsdir}/wv32vfw.dll -%{_codecsdir}/xfcodec.dll -%{_codecsdir}/ylc.vcm -%{_codecsdir}/Zlib.dll -%{_codecsdir}/zmbv.dll -%{_codecsdir}/ZyGoAudioS.qtx -%endif -%ifarch alpha ppc -%{_codecsdir}/14_4.so.6.0 -%{_codecsdir}/drv3.so.6.0 -%endif -%ifarch ppc -%{_codecsdir}/vid_cvid.xa -%{_codecsdir}/vid_iv32.xa -%endif - -%changelog -* Fri Aug 20 2010 Dominik Mierzejewski <rpm@greysector.net> 20100303-1 -- updated i386 pack - -* Mon Feb 11 2008 Dominik Mierzejewski <rpm@greysector.net> 20071007-1 -- updated i386 pack - -* Sat Oct 06 2007 Dominik Mierzejewski <rpm@greysector.net> 20060622-1 -- specfile cleanups -- added backwards compatibility Provides: -- dropped old history diff --git a/rpm/mplayer.spec b/rpm/mplayer.spec deleted file mode 100644 index 2db141cd20..0000000000 --- a/rpm/mplayer.spec +++ /dev/null @@ -1,298 +0,0 @@ -%define date %(date --iso) -%define svnbuild %(date +%Y%m%d) -%define codecsdir %{_libdir}/codecs - -Name: mplayer -Version: 1.0 -Release: 0.%{svnbuild}svn%{?dist} -Summary: Movie player playing most video formats and DVDs - -Group: Applications/Multimedia -License: GPL -URL: http://www.mplayerhq.hu/ -Source0: http://www.mplayerhq.hu/MPlayer/releases/mplayer-export-snapshot.tar.bz2 -Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: SDL-devel -BuildRequires: aalib-devel -BuildRequires: alsa-lib-devel -BuildRequires: cdparanoia-devel -BuildRequires: desktop-file-utils -BuildRequires: em8300-devel -BuildRequires: enca-devel -BuildRequires: faad2-devel -BuildRequires: fontconfig-devel -BuildRequires: freetype-devel >= 2.0.9 -BuildRequires: fribidi-devel -BuildRequires: giflib-devel -BuildRequires: gtk2-devel -BuildRequires: ladspa-devel -BuildRequires: lame-devel -BuildRequires: libGL-devel -BuildRequires: libXinerama-devel -BuildRequires: libXv-devel -BuildRequires: libXxf86dga-devel -BuildRequires: libXxf86vm-devel -BuildRequires: libcaca-devel -BuildRequires: libdca-devel -BuildRequires: libdv-devel -BuildRequires: libdvdnav-devel -BuildRequires: libjpeg-devel -BuildRequires: libmpcdec-devel -BuildRequires: libtheora-devel -BuildRequires: libvorbis-devel -BuildRequires: lirc-devel -BuildRequires: live-devel -BuildRequires: lzo-devel >= 2 -BuildRequires: speex-devel >= 1.1 -BuildRequires: xvidcore-devel >= 0.9.2 -%{?_with_arts:BuildRequires: arts-devel} -%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel} -%{?_with_directfb:BuildRequires: directfb-devel} -%{?_with_esound:BuildRequires: esound-devel} -%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel} -%{?_with_libmad:BuildRequires: libmad-devel} -%{?_with_openal:BuildRequires: openal-devel} -%{?_with_samba:BuildRequires: samba-common} -%{?_with_svgalib:BuildRequires: svgalib-devel} -%{?_with_xmms:BuildRequires: xmms-devel} -# for XML docs, SVN only -BuildRequires: docbook-dtds -BuildRequires: docbook-style-xsl -BuildRequires: libxml2 -BuildRequires: libxslt - -%description -MPlayer is a movie player that plays most MPEG, VOB, AVI, OGG/OGM, -VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, -RoQ, and PVA files. You can also use it to watch VCDs, SVCDs, DVDs, -3ivx, RealMedia, and DivX movies. -It supports a wide range of output drivers including X11, XVideo, DGA, -OpenGL, SVGAlib, fbdev, AAlib, DirectFB etc. There are also nice -antialiased shaded subtitles and OSD. -Non-default rpmbuild options: ---with samba: Enable Samba (smb://) support ---with xmms: Enable XMMS input plugin support ---with amr: Enable AMR support ---with libmad: Enable libmad support ---with openal: Enable OpenAL support ---with jack: Enable JACK support ---with arts: Enable aRts support ---with esound: Enable EsounD support ---with directfb:Enable DirectFB support ---with svgalib: Enable SVGAlib support - -%package gui -Summary: GUI for MPlayer -Group: Applications/Multimedia -Requires: mplayer = %{version}-%{release} - -%description gui -This package contains a GUI for MPlayer and a default skin for it. - -%package doc -Summary: MPlayer documentation in various languages -Group: Documentation - -%description doc -MPlayer documentation in various languages. - - -%prep -%setup -q -n mplayer-export-%{date} - -doconv() { - iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \ - mv DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 -} -for lang in de es fr it ; do doconv iso-8859-1 utf-8 $lang ; done -for lang in hu pl ; do doconv iso-8859-2 utf-8 $lang ; done -for lang in ru ; do doconv koi8-r utf-8 $lang ; done - -mv DOCS/man/zh DOCS/man/zh_CN - -%build -./configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --datadir=%{_datadir}/mplayer \ - --mandir=%{_mandir} \ - --confdir=%{_sysconfdir}/mplayer \ - --libdir=%{_libdir} \ - --codecsdir=%{codecsdir} \ - \ - --enable-gui \ - --disable-termcap \ - --disable-bitmap-font \ - --enable-lirc \ - --enable-joystick \ - %{!?_with_samba:--disable-smb} \ - --disable-dvdread-internal \ - --disable-libdvdcss-internal \ - \ - %{!?_with_amr:--disable-libamr_nb --disable-libamr_wb} \ - %{!?_with_libmad:--disable-mad} \ - %{?_with_xmms:--enable-xmms} \ - \ - --disable-svga \ - --%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \ - %{!?_with_svgalib:--disable-svga} \ - \ - %{!?_with_arts:--disable-arts} \ - %{!?_with_esound:--disable-esd} \ - %{!?_with_jack:--disable-jack} \ - %{!?_with_openal:--disable-openal} \ - \ - --language=all \ - \ - %{?_with_xmms:--with-xmmslibdir=%{_libdir}} \ - - -%{__make} - -mv -f mplayer gmplayer -%{__make} distclean - -./configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --datadir=%{_datadir}/mplayer \ - --mandir=%{_mandir} \ - --confdir=%{_sysconfdir}/mplayer \ - --libdir=%{_libdir} \ - --codecsdir=%{codecsdir} \ - \ - --disable-termcap \ - --disable-bitmap-font \ - --enable-lirc \ - --enable-joystick \ - %{!?_with_samba:--disable-smb} \ - --disable-dvdread-internal \ - --disable-libdvdcss-internal \ - \ - %{!?_with_amr:--disable-libamr_nb --disable-libamr_wb} \ - %{!?_with_libmad:--disable-mad} \ - %{?_with_xmms:--enable-xmms} \ - \ - --disable-svga \ - --%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \ - %{!?_with_svgalib:--disable-svga} \ - \ - %{!?_with_arts:--disable-arts} \ - %{!?_with_esound:--disable-esd} \ - %{!?_with_jack:--disable-jack} \ - %{!?_with_openal:--disable-openal} \ - \ - --language=all \ - \ - %{?_with_xmms:--with-xmmslibdir=%{_libdir}} \ - - -%{__make} - -# build HTML documentation from XML files -pushd DOCS/xml -%{__make} html-chunked -popd - -%install -rm -rf $RPM_BUILD_ROOT doc - -make install DESTDIR=$RPM_BUILD_ROOT STRIPBINARIES=no -install -pm 755 TOOLS/midentify.sh $RPM_BUILD_ROOT%{_bindir}/ - -# Clean up documentation -mkdir doc -cp -pR DOCS/* doc/ -rm -r doc/man doc/xml doc/README -mv doc/HTML/* doc/ -rm -rf doc/HTML - -# Default config files -install -Dpm 644 etc/example.conf \ - $RPM_BUILD_ROOT%{_sysconfdir}/mplayer/mplayer.conf -# use Nimbus Sans L font for OSD (via fontconfig) -echo "fontconfig=yes" >>$RPM_BUILD_ROOT%{_sysconfdir}/mplayer/mplayer.conf -echo "font=\"Sans\"" >>$RPM_BUILD_ROOT%{_sysconfdir}/mplayer/mplayer.conf - -# GUI mplayer -install -pm 755 g%{name} $RPM_BUILD_ROOT%{_bindir}/ - -# Default skin -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/mplayer/skins -tar xjC $RPM_BUILD_ROOT%{_datadir}/mplayer/skins --exclude=.svn -f %{SOURCE1} -ln -s Blue $RPM_BUILD_ROOT%{_datadir}/mplayer/skins/default - -# Icons -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps -install -pm 644 etc/mplayer.xpm \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps - -# Desktop file -desktop-file-install \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - etc/%{name}.desktop - -# Codec dir -install -dm 755 $RPM_BUILD_ROOT%{codecsdir} - - -%post gui -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : -update-desktop-database &>/dev/null || : - - -%postun gui -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : -update-desktop-database &>/dev/null || : - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-, root, root, -) -%doc AUTHORS Changelog LICENSE README -%dir %{_sysconfdir}/mplayer -%config(noreplace) %{_sysconfdir}/mplayer/mplayer.conf -%config(noreplace) %{_sysconfdir}/mplayer/input.conf -%{_bindir}/midentify.sh -%{_bindir}/mplayer -%dir %{codecsdir}/ -%dir %{_datadir}/mplayer/ -%{_mandir}/man1/mplayer.1* -%lang(cs) %{_mandir}/cs/man1/mplayer.1* -%lang(de) %{_mandir}/de/man1/mplayer.1* -%lang(es) %{_mandir}/es/man1/mplayer.1* -%lang(fr) %{_mandir}/fr/man1/mplayer.1* -%lang(hu) %{_mandir}/hu/man1/mplayer.1* -%lang(it) %{_mandir}/it/man1/mplayer.1* -%lang(pl) %{_mandir}/pl/man1/mplayer.1* -%lang(ru) %{_mandir}/ru/man1/mplayer.1* -%lang(zh_CN) %{_mandir}/zh_CN/man1/mplayer.1* - -%files gui -%defattr(-, root, root, -) -%{_bindir}/gmplayer -%{_datadir}/applications/*mplayer.desktop -%{_datadir}/icons/hicolor/32x32/apps/mplayer.xpm -%{_datadir}/mplayer/skins/ - -%files doc -%defattr(-, root, root, -) -%doc doc/en/ doc/tech/ -%lang(cs) %doc doc/cs/ -%lang(de) %doc doc/de/ -%lang(es) %doc doc/es/ -%lang(fr) %doc doc/fr/ -%lang(hu) %doc doc/hu/ -%lang(pl) %doc doc/pl/ -%lang(ru) %doc doc/ru/ -%lang(zh_CN) %doc doc/zh_CN/ - - -%changelog -* Sat Oct 06 2007 Dominik Mierzejewski <rpm at greysector.net> -- adapted livna specfile for inclusion in SVN diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index 5332311856..05492ce490 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -1021,7 +1021,7 @@ fail: m_struct_free(&stream_opts, opts); return STREAM_UNSUPPORTED; } - mp_tmsg(MSGT_DVD,MSGL_ERR,"MPlayer was compiled without DVD support, exiting.\n"); + mp_tmsg(MSGT_DVD,MSGL_ERR,"mpv was compiled without DVD support, exiting.\n"); m_struct_free(&stream_opts,opts); return STREAM_UNSUPPORTED; } @@ -18,4 +18,4 @@ #include "version.h" -const char *mplayer_version = "mplayer " VERSION; +const char *mplayer_version = "mpv " VERSION; |