summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cleanup: Make vcd_seek_to_track() static in more filesreimar2011-06-294-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33436 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache2.c: Avoid warnings about discarding volatilereimar2011-06-291-4/+10
| | | | | | | | | In practice this should not really make a difference, but the code is not significantly worse and it is more correct. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33435 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33447 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: some warning fixes and minor cleanupsreimar2011-06-295-13/+9
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33399 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33400 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33421 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33425 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33426 b3059339-0415-0410-9bf9-f77b7e298cf2
* input: support up to 20 mouse buttonsreimar2011-06-292-2/+42
| | | | | | | Increase the number of supported mouse buttons from 10 to 20. There really seem to be input devices with at least 12. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33391 b3059339-0415-0410-9bf9-f77b7e298cf2
* manpage: use upper case names for some keysib2011-06-291-4/+4
| | | | | | | Change some key names to upper case and to match the names used in input.conf bindings. Most of them already were in this form. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33382 b3059339-0415-0410-9bf9-f77b7e298cf2
* core: move m_config_free() last before exitreimar2011-06-291-5/+6
| | | | | | | | Move the call to m_config_free() to be the last thing done before exiting, otherwise mp_msg() might stop working if options it uses are freed/reset. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33380 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: handle X11 dependencies at depending checksdiego2011-06-291-7/+5
| | | | | | | | | Make features depending on X check its availability at their individual checks rather than having the X11 check disable them if needed. This makes each individual feature check self-contained, which is desirable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33371 b3059339-0415-0410-9bf9-f77b7e298cf2
* playtree: free parameter values when entry is freedreimar2011-06-291-1/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33364 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: fix swab() check for Windowscehoyos2011-06-291-1/+2
| | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33339 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33349 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_ffmpeg.c: fix one case of "-lavdopts vstats" crashingiive2011-06-291-1/+4
| | | | | | | | | | | Fix segfault with -lavdopts vstats and some codecs. The vstats option relies on avctx->coded_frame being filled. Unfortunately not all codecs do that (e.g. VP8) thus causing NULL dereference. FFmpeg code seems to always check if coded_frame != NULL, so we should do the same. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33347 b3059339-0415-0410-9bf9-f77b7e298cf2
* Windows: ao_pcm: add io.h include for MinGW64diego2011-06-291-0/+1
| | | | | | | | On MinGW64 io.h is needed for _get_osfhandle(). patch by Stephen Sheldon, sfsheldo gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33341 b3059339-0415-0410-9bf9-f77b7e298cf2
* command.c: Add missing osdep/strsep.h #includediego2011-06-291-0/+1
| | | | | | | | The include is needed on systems without native strsep(). based on a patch by Stephen Sheldon, sfsheldo gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33338 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: Remove checks for default inline asm featuresDiego Biurrun2011-06-282-33/+4
| | | | | | | Remove checks for compiler support of >= 10 assembler operands and named assembler arguments. Just assume the features are always available. These features were only missing from obsolete GCC versions which are not supported any more.
* Merge branch '10bit'Uoti Urpala2011-06-2612-172/+143
|\
| * vd_ffmpeg: autoselect output colorspaces without codecs.confUoti Urpala2011-06-265-167/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | Selecting the colorspace to output from a decoder is done in the function mpcodecs_config_vo(). Add a new version of this function, mpcodecs_config_vo2(), that allows the decoder to specify a list of candidate colorspaces instead of always using a hardcoded list specified in the codecs.conf entry. If the codecs.conf entry has any "out" lines then those still take priority and the decoder-provided list (if any) is ignored. Make vd_ffmpeg provide a list of the colorspaces it's willing to output. Remove "out" lines from most entries for libavcodec video decoders in codecs.conf, so that the automatic values are now used instead.
| * video/colorspaces: add new 9/10-bit formats from libavcodecUoti Urpala2011-06-267-2/+96
| | | | | | | | | | | | | | Add new internal 9/10-bit IMGFMT values and mappings to the corresponding libav* PIX_FMT_* values. Partially based on a patch from Arne Bochem <arneb.mp@ccan.de>.
| * fmt-conversion.c: print name of any unrecognized pixfmtUoti Urpala2011-06-261-3/+10
| | | | | | | | | | Change the error message about unrecognized pixfmt values to include the symbolic name of the pixfmt (available from libavutil).
* | ao_rsound: add new RSound audio output driverHans-Kristian Arntzen2011-06-265-0/+256
| |
* | cleanup: ao_pcm: remove useless assignment to ao->buffersizeUoti Urpala2011-06-261-1/+0
| |
* | av_log: map libav* debug messages to MSGL_DBG2Uoti Urpala2011-06-261-0/+2
|/ | | | | | Map libav* messages with verbosity value higher than AV_LOG_VERBOSE (likely to be AV_LOG_DEBUG) to MSGL_DBG2 instead of MSGL_V. Before MSGL_V was used for everything above AV_LOG_INFO.
* cleanup: remove warnings under libmenu/Clément Bœsch2011-06-246-7/+9
|
* vf_pullup, vf_yadif: pts handling fixesRudolf Polzer2011-06-242-15/+22
| | | | | | | vf_pullup: continue to calculate pts after detecting a seek vf_yadif: add pts calculation for the one-frame-becomes-two mode (-vf yadif=1)
* Windows: vo/input: handle WM_XBUTTONDOWN messageRudolf Polzer2011-06-191-1/+16
| | | | | | | WM_XBUTTONDOWN is used for extra mouse buttons (mapped to button 5 and button 6 in mplayer2). Previously only vo_directx handled this message. Add support to w32_common.c event handling too (used by vo_direct3d and vo_gl/vo_gl2 on Windows).
* demux: pad even 0-size demux packet data (fixes sd_ass crash)Uoti Urpala2011-06-181-17/+10
| | | | | | | | | | | | | sd_ass relies on there being a zero byte after packet data. However the packet allocation routines special-cased data length 0 and left the data pointer as NULL in that case. This could cause a crash in sd_ass if there was an empty subtitle packet. Change the allocation routines to stop special-casing empty data and always allocate padding. Empty packets are not so common that special casing them would be a worthwhile optimization. Also fix resize_demux_packet() to use MP_INPUT_BUFFER_PADDING SIZE as the padding size, instead of a hardcoded value of 8.
* ffmpeg_files/intreadwrite.h: fix AV_RL32/AV_RB32 signednessUoti Urpala2011-06-151-2/+2
| | | | | | | | | The output type of the AV_RL32/AV_RB32 macros was signed int. The resulting overflow broke at least some ASF streams with large timestamps (AV_RL32 used in demux_asf.c timestamp parsing code). Fix by adding a cast to uint32_t. This code comes from FFmpeg, and the matching code in Libav/FFmpeg is still broken (but not used there in most common configurations).
* sub/ass: use default style, not first style unconditionallyGrigori Goronzy2011-06-141-1/+2
| | | | | | | Turns out it's a bad idea to just always unconditionally use the first style. Make mplayer2 use and set the style according to the track's default_style property. Fixes the -ass-styles option broken with recent libass versions (ticket #40).
* input: add useful default pointer button bindingsGrigori Goronzy2011-06-143-0/+11
| | | | | | Add two mouse button bindings: 1) left button double click toggles fullscreen 2) right button pauses/unpauses
* ao: fix crash after ao init failure (from recent 3a5fd15fa2)Uoti Urpala2011-05-161-1/+3
| | | | | | | | If opening an audio output driver using the old API failed the "global_ao" variable was not set back to NULL as it should have been. This caused an assert failure the next time there was an attempt to open such an AO (either due to fallback to another AO after the failure or after moving to another file). Fix.
* vo_xvmc: drop XvMC supportUoti Urpala2011-05-098-1481/+9
| | | | | | | | | Due to libavcodec changes vo_xvmc would have needed some modifications to keep working. However, I think there's little real demand for XvMC, so I'll just drop XvMC support. XvMC only supported MPEG-2, making it of very limited usefulness nowadays, plus the vo_xvmc implementation was not high quality and never worked particularly well or reliably anyway.
* audio: disallow partial samples, fix ad_pcm to complyUoti Urpala2011-05-072-3/+11
| | | | | | | | Add some asserts to check that decoders/filters produce complete samples (byte amounts must be multiples of channels*datatype_size) and that audio output drivers also accept input in complete units. Fix ad_pcm which was known to violate this if its last input packet didn't stop at a sample boundary.
* options: fix -profile parsing after 2db33ab48cUoti Urpala2011-05-071-1/+3
| | | | | | | | | | | | | | Commit 2db33ab48cfa785 ("options: support string list separators other than ','") started using the "priv" field in options of string list type to store the separator character. However, the "profile" option has a custom type which uses the same parsing function but uses the "priv" field for another purpose. As a result "-profile" parsing used a "random" character as the separator instead of ','; at least uses which depended on ',' working were likely to fail, and if the separator used happened to be a character occurring in the profile name then any use of -profile could break. Fix by adding a check in the parsing function to only read the priv field if the option type is normal string list.
* cleanup: shut up more warningsClément Bœsch2011-05-0649-122/+107
|
* ao_pcm, core: use new API in ao_pcm, change timing with itUoti Urpala2011-05-055-146/+133
| | | | | | | | | | | | | | | | | Change ao_pcm to use the new audio output driver API and clean up some of the code. Rewrite the logic controlling how playback timing works when using -ao pcm. Deprecate the "fast" suboption; its only effect now is to print a warning, but it's still accepted so that specifying it is not an error. Before, timing with -ao pcm and video enabled had two possible modes. In the default mode playback speed was rather arbitrary - not realtime, but not particularly fast. -ao pcm:fast tried to play back at maximum video playback speed - mostly succeeding, but not quite guaranteed to work in all cases. Now the default is to play at realtime speed. The -benchmark option can now be used to get faster playback (same as the video-only case). In the audio-only case playback is always maximum speed.
* ao_null: convert to new API, cleanup/rewriteUoti Urpala2011-05-051-74/+70
|
* audio output: add a new AO driver APIUoti Urpala2011-05-053-69/+169
| | | | | | | Add a new audio output driver API. The main change is the addition of a context struct where data can be kept instead of using globals. The old API remains available. This commit does not yet convert any driver to use the new API.
* cleanup: reindent audio_out.[ch]Uoti Urpala2011-05-042-65/+61
| | | | | | Reindent audio_out.c and audio_out.h. Also remove trailing '_s' from two struct names (which are not currently used anywhere) and make the audio_out_drivers[] table static.
* input: make slave command file descriptors nonblockingUoti Urpala2011-05-043-6/+12
| | | | | | | Neither fd 0 slave input (-slave) nor additional opened fds (-input file=X) were set to nonblocking mode as they should have been. Fix. Also rename the horribly generic USE_SELECT #define used for a specific slave input detail.
* audio: clamp sample values in float->int format conversionsRudolf Polzer2011-05-041-4/+4
| | | | | | | | | Make af_format clamp float sample values to the range [-1, 1] before conversion to integer types. Before any out-of-range values wrapped around and caused nasty artifacts. This filter is used for all automatic format conversions; thus any decoder that outputs floats with possible out-of-range values would have been affected by the bad conversion if its output needed to be converted to integers for AO.
* audio: avoid duplicated error messages on init failureUoti Urpala2011-05-031-1/+3
| | | | | | | | | | | dec_audio.c init_audio_codec() would in one case print "ADecoder init failed :(\n" and return failure. Its only caller init_best_audio_codec() printed exactly the same message if the returned result was failure. Change the latter message to say "Could not open audio decoder %s.\n" instead. Some of the per-open-attempt messages are kind of value about their context; this new message should make it more clear where the attempt to open one specific codec ends.
* ad_ffmpeg: return failure from init() if initial decode failsUoti Urpala2011-05-031-6/+13
| | | | | | | | | | | | | | The init() method in ad_ffmpeg tries to decode some audio data after opening the libavcodec decoder; however the method returned success even if this part failed. Change it to return failure instead, indicating that the codec could not be successfully opened. This improves behavior at least with some AAC files, for which the libavcodec decoder can be successfully initialized but decoding packets always fails. Before the audio would be decoded with libavcodec, producing only a constant stream of errors; after this commit audio decoder initialization falls back to FAAD (if available) which works for these samples.
* input/joystick.c: add #include missing from 23cb829072Uoti Urpala2011-05-031-0/+1
| | | | | There was a '#include "keycodes.h"' line missing from commit 23cb829072, which broke build with --enable-joystick.
* vo_svga: fix build after previous commit 6506d4adClément Bœsch2011-05-031-1/+1
| | | | | | | vo_svga.c used its static query_format() function before defining it, but had no prototype before the use. Thus is depended on the otherwise useless static declaration in a shared header, and broke after that was removed. Fix by adding an advance declaration inside the file.
* cleanup: remove more warningsClément Bœsch2011-05-0221-102/+37
|
* Merge branch 'mplayer1_changes'Uoti Urpala2011-05-0230-199/+518
|\
| * codecs.conf: add Etymonix MPEG-2 I-frame codec to ffmpeg12cehoyos2011-05-021-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33332 b3059339-0415-0410-9bf9-f77b7e298cf2
| * ad_speex: support decoding stream without header packetreimar2011-05-021-13/+14
| | | | | | | | | | | | | | Setup default speex modes, allows decoding of speex in flv which does not contain a header packet. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33327 b3059339-0415-0410-9bf9-f77b7e298cf2
| * commands: Fix DVD angle cycling upreimar2011-05-021-0/+2
| | | | | | | | | | | | Patch by 侯红勋 [houhongxun gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33317 b3059339-0415-0410-9bf9-f77b7e298cf2
| * configure: Make largefile support non-optionaldiego2011-05-022-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33314 b3059339-0415-0410-9bf9-f77b7e298cf2 rpm: Delete reference to removed --enable-largefiles configure option. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33321 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: rpm/mplayer.spec
| * cleanup: vo_fbdev: simplify some codereimar2011-05-021-39/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify by using FFMAX3. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33300 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify colormap generation code, avoid some mallocs and add frees for one error case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33302 b3059339-0415-0410-9bf9-f77b7e298cf2 Use memcpy_pic instead of reimplementing it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33303 b3059339-0415-0410-9bf9-f77b7e298cf2
| * codecs.conf: add Canopus SD50 (CDV5) to ffdv entrycehoyos2011-05-021-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33301 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_fbdev: clip x/y offsets to avoid bad video placementreimar2011-05-022-3/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33299 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_fbdev: Add -geometry support reusing common codereimar2011-05-021-13/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33298 b3059339-0415-0410-9bf9-f77b7e298cf2
| * codecs.conf: add Deluxe Paint Animation decoder from libavcodecreimar2011-05-021-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33290 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_fbdev: add RGB framebuffer supportreimar2011-05-021-7/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33289 b3059339-0415-0410-9bf9-f77b7e298cf2
| * mp_taglists.c: add CODEC_ID_ANM and CODEC_ID_AVSreimar2011-05-021-0/+2
| | | | | | | | | | | | Add mapping between codec ID and tag for ANM and AVS. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33288 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vd_ffmpeg: Make DR work with reget_buffer without buffer_hintsreimar2011-05-021-0/+3
| | | | | | | | | | | | Allow DR to work with reget_buffer when no buffer_hints are set. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33287 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vd_ffmpeg: handle reget_buffer in DRI failure fallback codereimar2011-05-021-0/+6
| | | | | | | | | | | | Allow reget_buffer to somewhat work after direct rendering failure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33286 b3059339-0415-0410-9bf9-f77b7e298cf2
| * demux_ts: Hint at -tsprobe option when no audio stream is founddiego2011-05-021-1/+1
| | | | | | | | | | | | patch by Godmar Back, godmar gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33271 b3059339-0415-0410-9bf9-f77b7e298cf2
| * ad_qtaudio: don't run win32 loader code when it's not usedreimar2011-05-021-2/+2
| | | | | | | | | | | | | | Do not try to set up the FS segment when using quicktime to decode, it makes no sense to do that. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33259 b3059339-0415-0410-9bf9-f77b7e298cf2
| * codecs.conf: add Kega Video (kgv1) from libavcodeccehoyos2011-05-021-0/+8
| | | | | |