summaryrefslogtreecommitdiffstats
path: root/etc
Commit message (Collapse)AuthorAgeFilesLines
* codecs.conf: add apco, ap4h, ai55, ai15 fourccscompn2011-02-151-0/+5
| | | | | | | 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
* libmpeg2: drop libmpeg2 supportUoti Urpala2011-02-011-39/+0
| | | | | libavcodec mpeg2 decoder has been the default for a while and seems to work fine.
* vo_zr2: drop Zoran supportUoti Urpala2011-01-311-7/+0
| | | | | | | 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.
* codecs.conf, vd_ffmpeg: Enable fflagarith video decodercehoyos2011-01-311-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32773 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add format id for FLAC in movcehoyos2011-01-311-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32767 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: Fix playback of ffv1 yuv422p16cehoyos2011-01-311-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32764 b3059339-0415-0410-9bf9-f77b7e298cf2
* example.conf: Disambiguate remarks about profilesdiego2011-01-311-15/+19
| | | | | | | 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
* Merge branch 'hr-seek'Uoti Urpala2010-12-201-0/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * input: add default keybindings Shift+[arrow] for small exact seeksUoti Urpala2010-12-201-0/+5
| |
| * input: support bindings with modifier keys for X inputUoti Urpala2010-12-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | example.conf: add some profile information and user-agent examplescompn2010-12-161-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | codecs.conf: add ffmpeg g722 audio codeccompn2010-12-161-0/+7
| | | | | | | | | | | | works on incoming/g722/ sample git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32662 b3059339-0415-0410-9bf9-f77b7e298cf2
* | codecs.conf: add Avid DNxHD through QuickTimereimar2010-12-161-1/+10
|/ | | | | | | | | | | | | | | | 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
* cosmetics: Fix Bluray vs. Blu-ray typodiego2010-11-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32606 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: Prefer FFmpeg AAC decoder over libfaad2diego2010-11-141-2/+1
| | | | | | | | | | 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
* codecs.conf: document need to add fourccs to parser list in demuxer.ccehoyos2010-11-081-0/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32597 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add missing YV12 output formats for FFmpeg codecsreimar2010-11-081-4/+4
| | | | | | | 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
* codecs.conf: mark fflatm non-buggy (now default for AAC/LATM)reimar2010-11-081-1/+1
| | | | | | | 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
* codecs_conf, mp_taglists: Use only one fourcc for LATMreimar2010-11-081-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32584 b3059339-0415-0410-9bf9-f77b7e298cf2
* mplayer.desktop: Add video/3gpp and application/x-flash-video mime typesdiego2010-11-081-1/+1
| | | | | | patch extracted from the ALT Linux patch set git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32574 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf, mp_taglists: Support FFmpeg LATM decodingcehoyos2010-11-081-15/+22
| | | | | | | | 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
* codecs.conf: add another xdcam mpeg2 fourcc/isom xd54compn2010-11-021-6/+7
| | | | | | Also mark ffwmvp as requiring lavf demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32440 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: Partial support for ffwmvp (only works with -demuxer lavf)cehoyos2010-11-021-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32359 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add fourcc AMV2, WAWVcompn2010-11-021-3/+11
| | | | | | | 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
* codecs.conf: add matchware screen codec fourcc MWSCcompn2010-11-021-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32022 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add fourcc: IMM4, LZOC, DIRC, MHFY, MSA1, vvvccompn2010-11-021-0/+42
| | | | | | | | 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
* spelling fixessiretart2010-11-021-1/+1
| | | | | | | | | | 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
* codecs.conf: add binary expression codec for fourcc MTS2compn2010-11-021-0/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31872 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: Support FFmpeg's native AMR Narrowband decodercehoyos2010-11-021-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31830 b3059339-0415-0410-9bf9-f77b7e298cf2
* libgsm: Remove libgsm wrapperreimar2010-11-021-10/+0
| | | | | | | | | | 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
* codecs.conf: Add/fix GSM audio decoding through FFmpegreimar2010-11-021-3/+25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31656 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: Support libgsm via libavcodecreimar2010-11-021-0/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31629 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_mpg123: add MP3 decoding through libmpg123diego2010-11-021-0/+15
| | | | | | patch by Thomas Orgis, thomas-forum orgis org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31590 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: Update ffvp8 comment.cehoyos2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31585 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: change ffvp8 status from "buggy" to "working"cehoyos2010-11-021-1/+1
| | | | | | ffvp8 decodes all reference vectors fine. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31576 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs_conf: Add FFmpeg VP8 decoderreimar2010-11-021-0/+9
| | | | | | Currently not working since MPlayer requires edge emulation support. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31542 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_ts: detect LATM AAC as a separate typereimar2010-11-021-1/+1
| | | | | | | | 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
* codecs.conf: remove yuv422 format from VDPAU sectioncehoyos2010-11-021-1/+0
| | | | | | yuv422 is not supported by current VDPAU hardware. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31362 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add M701: Matrox MPEG-2 intra-only.cehoyos2010-11-021-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31342 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge svn changes up to r31332Uoti Urpala2010-06-051-1/+1
|\
| * Update codecs.conf version again, we had quite a few additions to it.reimar2010-06-051-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31332 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31265Uoti Urpala2010-06-021-0/+1
|\|
| * add "lpcJ" fourcc for the RealAudio 1.0 codec.compn2010-05-281-0/+1
| | | | | | | | | | | | | | patch by Francesco Lavra git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31257 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31226Uoti Urpala2010-05-301-0/+10
|\|
| * Both XVID and VDPAU decode our SIPP sample better than current libavcodec.cehoyos2010-05-261-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31222 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for decoding VP8 through libvpx wrapper in FFmpeg.diego2010-05-251-0/+8
| | | | | | | | | | | | | | patch by James Zern, jzern google com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31220 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31211Uoti Urpala2010-05-301-0/+1
|\| | | | | | | | | The merged cache2.c changes are known to have problems. Will merge further fixes to them before merging this to the master branch.
| * Samsung uses SIPP as FourCC for MPEG-4 ASP.cehoyos2010-05-251-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31211 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31197Uoti Urpala2010-05-301-0/+9
|\|
| * Add final missing bits of CineForm HD support on Linux (via the Windowssesse2010-05-231-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DirectShow codec). Required changes: - codecs.conf entry (of course). - Allow opening files with “.col” in the file name, just like “vp3” and “.fpf” already was allowed. (CineForm expects to be able to do this, presumably for some color management code.) - In registry.c, fake a few registry keys that the codec expects the installer to have written. Also, change a few magic numbers (0, 2) to the appropriate constants (ERROR_SUCCESS, ERROR_FILE_NOT_FOUND) where appropriate, so the code is easier to follow. SMP works fine, but seemingly performs suboptimally (e.g., on my dual-core laptop, CineForm performs better if I lie to it and tell it I have four cores). I don't know if this is inherent in the codec, or some inefficiency in the emulated synchronization primitives. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31196 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31176Uoti Urpala2010-05-301-0/+39
|\|
| * Enable libavcodecs new MPEG-1 Audio float decoder.cehoyos2010-05-141-0/+39
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31175 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31169Uoti Urpala2010-05-301-1/+2
|\|
| * add FLV4 fourcc to vp6compn2010-05-091-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31148 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31097Uoti Urpala2010-04-261-2/+1
|\|
| * Update comment describing issues with ffaac.reimar2010-04-201-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31053 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31040Uoti Urpala2010-04-261-1/+3
|\|
| * Mark ffaac as buggy (thus making faad default again) andreimar2010-04-151-1/+3
| | | | | | | | | | | | | | document the know issues. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31039 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31033Uoti Urpala2010-04-261-0/+1
|\|
| * Add osd_show_progression: Show progress bar and elapsed/total time.cehoyos2010-04-091-0/+1
| | | | | | | | | | | | | | Patch by Hugo Chargois, hugo D chargois A free fr git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31028 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31004Uoti Urpala2010-04-261-2/+2
|\|
| * rename eatgv -> ffeatgv, lpcm -> fflpcmattila2010-03-311-2/+2
| | | | | | | | | | | | | | | | | | for consitently naming all ffmpeg codecs requested by compn git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30977 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30967Uoti Urpala2010-04-261-4/+4
|\|
| * Use vd_raw to handle NV12/NV21 formats, since we support them as pixel formatsreimar2010-03-191-4/+4
| | | | | | | | | | | | | | there is no need to do any conversion during decoding. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30939 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Prefer FFmpeg AAC decoder over libfaad.diego2010-03-171-16/+16
| | | | | | | | | | | | | | | | This