1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Commit Graph

955 Commits

Author SHA1 Message Date
Uoti Urpala
f9b5f2870c mp3lib: drop internal mp3lib tree
Delete mp3lib which has been the default mp3 decoder until now. In
addition to being an unnecessary embedded library it now fails to
compile correctly with the new gcc-4.6, producing noise.

After the deletion the default decoder priority for mp3 will be first
libmpg123 (a newer version of the code that mp3lib was based on) if
available, then ffmp3float which should be available in all normal
compiles. I think that some tweaking may be required as these decoder
alternatives get wider testing, but any problems should be solvable
and there should be no need for mp3lib.
2011-04-02 07:28:53 +03:00
cehoyos
8affafc2a8 codecs.conf: Add FFmpeg WC4 xan decoder
Patch by Philip Langdale, philipl overt org

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

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32843 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 19:16:49 +02:00
Uoti Urpala
7cd7416c73 libmpeg2: drop libmpeg2 support
libavcodec mpeg2 decoder has been the default for a while and seems to
work fine.
2011-02-01 20:10:27 +02:00
Uoti Urpala
626d5ed628 vo_zr2: drop Zoran support
There were multiple files specific to Zoran support, and they also
depended on internal FFmpeg headers (so it would probably have been
hard to get them to compile now even if you tried). It's obsolete now,
so just drop the whole mess.
2011-01-31 16:03:11 +02:00
cehoyos
9a021242a9 codecs.conf, vd_ffmpeg: Enable fflagarith video decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32773 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
cehoyos
5937ee8a5b codecs.conf: add format id for FLAC in mov
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32767 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
cehoyos
2ce17b5afd codecs.conf: Fix playback of ffv1 yuv422p16
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32764 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
diego
52ba5ea684 example.conf: Disambiguate remarks about profiles
Also move the profiles to the bottom of the example configuration file
as the original remarks in the file suggested.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32754 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
Uoti Urpala
0afb326035 Merge branch 'hr-seek'
* hr-seek:
  input: add default keybindings Shift+[arrow] for small exact seeks
  input: support bindings with modifier keys for X input
  core: audio: make ogg missing audio timing workaround more complex
  core: add support for precise non-keyframe-limited seeks
  core: add struct for queued seek info
  commands: add generic option -> property wrapper
  options: add "choice" option type, use for -pts-association-mode
  core: remove looping in update_video(), modify command handling a bit
  core: seek: use accurate seek mode with audio-only files
  core: avoid using sh_video->pts as "current pts"
  libvo: register X11 connection fd in input event system
  core: timing: add special handling of long frame intervals
  core: move central play loop to a separate function

Conflicts:
	DOCS/tech/slave.txt
2010-12-20 19:17:43 +02:00
Uoti Urpala
5bb2f9787f input: add default keybindings Shift+[arrow] for small exact seeks 2010-12-20 19:02:24 +02:00
Uoti Urpala
67fd58d6f0 input: support bindings with modifier keys for X input
Add support for binding commands to modifier+key combinations like
"Shift+Left" or "Ctrl+Alt+x", and support reading such combinations
from the output window of X VOs.

The recognized modifier names are Shift, Ctrl, Alt and Meta. Any
combination of those and then a non-modifier key name, separated by
'+', is accepted as a key name in input.conf. For non-special keys
that produce characters shift is ignored as a modifier. For example
"A" is handled as a key without modifiers even if you use shift to
write the capital letter; 'a' vs 'A' already distinguishes the
combinations with a normal keymap, and having separate 'a', 'Shift+A'
and 'A' (written with caps lock for example) would bring more
confusion than benefit.

Currently reading the modifier+key combinations is only supported in
the output window of those VOs that use x11_common.c event
handling. It's not possible to input the key combinations in other VOs
or in a terminal window.
2010-12-20 19:02:24 +02:00
compn
597dc5a388 example.conf: add some profile information and user-agent examples
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32709 b3059339-0415-0410-9bf9-f77b7e298cf2

add realplayer user-agent

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

add winamp useragent example

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32713 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 06:22:19 +02:00
compn
f96ba3ad32 codecs.conf: add ffmpeg g722 audio codec
works on incoming/g722/ sample

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32662 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 05:05:41 +02:00
reimar
04a3a3825f codecs.conf: add Avid DNxHD through QuickTime
Add support for decoding Avid DNxHD through the QuickTime component.
This is needed for the 10-bit variant which the FFmpeg decoder does not
support (unfortunately both use the same FourCC).

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

Bump codecs.conf version.

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

change dnxhd to qtdnxhd. consistant with all other quicktime decoders

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32658 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 04:57:04 +02:00
diego
aae78f0509 cosmetics: Fix Bluray vs. Blu-ray typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32606 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-14 12:23:56 +02:00
diego
e3c6f09752 codecs.conf: Prefer FFmpeg AAC decoder over libfaad2
FFmpeg's AAC decoder is much faster than libfaad2. The only known
exception is libfaad2 compiled in fixed-point mode on systems with
slow FPUs. Now that LATM support in FFmpeg is complete, FFmpeg's AAC
decoder has a similar feature set as libfaad2. This leaves no reason
not to use FFmpeg by default.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32605 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-14 12:23:56 +02:00
cehoyos
af4b23cd36 codecs.conf: document need to add fourccs to parser list in demuxer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32597 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:05:12 +02:00
reimar
01a10dd579 codecs.conf: add missing YV12 output formats for FFmpeg codecs
For FFmpeg codecs YV12 should always be in the supported format
lists if I420 is.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32593 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:05:11 +02:00
reimar
c739ab2992 codecs.conf: mark fflatm non-buggy (now default for AAC/LATM)
fflatm seems to be working, whereas external faad does not work at all
with latm (internal does).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32585 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:05:11 +02:00
reimar
50d5197611 codecs_conf, mp_taglists: Use only one fourcc for LATM
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32584 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:05:07 +02:00
diego
d783c38ce1 mplayer.desktop: Add video/3gpp and application/x-flash-video mime types
patch extracted from the ALT Linux patch set

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32574 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:03:35 +02:00
cehoyos
0a2d29a75b codecs.conf, mp_taglists: Support FFmpeg LATM decoding
Also move libfaad codecs.conf entry into the same position as in svn
(no functionality change since ffaac is marked buggy so only faad is
used by default regardless or order).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32571 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:03:27 +02:00
compn
d6a143acc1 codecs.conf: add another xdcam mpeg2 fourcc/isom xd54
Also mark ffwmvp as requiring lavf demuxer.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32440 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
cehoyos
408f435e91 codecs.conf: Partial support for ffwmvp (only works with -demuxer lavf)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32359 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
compn
0f985365fb codecs.conf: add fourcc AMV2, WAWV
add binary codec for fourcc AMV2
add fourcc WAWV to ffodivx and ffodivxvdpau

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32034 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
compn
26fb47e54c codecs.conf: add matchware screen codec fourcc MWSC
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32022 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
compn
9ad38452eb codecs.conf: add fourcc: IMM4, LZOC, DIRC, MHFY, MSA1, vvvc
add binary codecs for fourcc: IMM4, LZOC, DIRC, MHFY, MSA1
map vvvc fourcc to ffh264
works on the single vvvc sample from uncommon codecs list

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31983 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
siretart
2e6ff523dd spelling fixes
Found by the Debian QA tool 'lintian'

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

reintroduce typo in genres.h that was fixed fixed r31913 to match the id3v2 spec

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31920 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:03 +02:00
compn
7d7f3345e7 codecs.conf: add binary expression codec for fourcc MTS2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31872 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
cehoyos
d1ecb411b3 codecs.conf: Support FFmpeg's native AMR Narrowband decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31830 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar
6c3c1588f5 libgsm: Remove libgsm wrapper
Remove copy of old and ugly libgsm code and wrapper.
Decoding these formats is supported via FFmpeg both natively and
through libgsm.

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

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31664 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:22 +02:00
reimar
4d83c67b5c codecs.conf: Add/fix GSM audio decoding through FFmpeg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31656 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar
a874569db6 codecs.conf: Support libgsm via libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31629 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
diego
d86aad3d56 ad_mpg123: add MP3 decoding through libmpg123
patch by Thomas Orgis, thomas-forum orgis org

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31590 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:46 +02:00
cehoyos
d4aefd6d74 codecs.conf: Update ffvp8 comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31585 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
cehoyos
055f411ce3 codecs.conf: change ffvp8 status from "buggy" to "working"
ffvp8 decodes all reference vectors fine.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31576 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
reimar
c795508d5f codecs_conf: Add FFmpeg VP8 decoder
Currently not working since MPlayer requires edge emulation support.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31542 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:42 +02:00
reimar
bdafaeb65c demux_ts: detect LATM AAC as a separate type
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31520 b3059339-0415-0410-9bf9-f77b7e298cf2

Place AUDIO_AAC_LATM definition next to AUDIO_AAC.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31521 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:09 +02:00
cehoyos
74f5659dc2 codecs.conf: remove yuv422 format from VDPAU section
yuv422 is not supported by current VDPAU hardware.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31362 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:42 +02:00
cehoyos
6d035be081 codecs.conf: add M701: Matrox MPEG-2 intra-only.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31342 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:06:31 +02:00
Uoti Urpala
8362ad36ac Merge svn changes up to r31332 2010-06-05 23:37:42 +03:00
reimar
601d6af3ec Update codecs.conf version again, we had quite a few additions to it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31332 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 18:11:51 +00:00
Uoti Urpala
4cf9a52a64 Merge svn changes up to r31265 2010-06-02 17:46:33 +03:00
Uoti Urpala
8ce2c41ca5 Merge svn changes up to r31226 2010-05-30 16:25:04 +03:00
Uoti Urpala
2f1a518d45 Merge svn changes up to r31211
The merged cache2.c changes are known to have problems. Will merge
further fixes to them before merging this to the master branch.
2010-05-30 16:14:55 +03:00
Uoti Urpala
9b68a49d01 Merge svn changes up to r31197 2010-05-30 15:58:55 +03:00
Uoti Urpala
a286506467 Merge svn changes up to r31176 2010-05-30 15:37:34 +03:00
Uoti Urpala
6f199ab3d9 Merge svn changes up to r31169 2010-05-30 15:27:58 +03:00
compn
52cc89f751 add "lpcJ" fourcc for the RealAudio 1.0 codec.
patch by Francesco Lavra


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31257 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 21:03:29 +00:00