summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* stream_cue: Avoid probing empty filename in cue_find_bin()iive2011-07-061-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33521 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_cue: fix multiple bugsreimar2011-07-061-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spelling fix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33510 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify: remove an unnecessary loop variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33511 b3059339-0415-0410-9bf9-f77b7e298cf2 Add some "const". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33512 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify NULL check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33513 b3059339-0415-0410-9bf9-f77b7e298cf2 Avoid crash if terminating " is missing. Part of patch by Ivan Kalvachev [ikalvachev gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33514 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix 0-termination being placed one byte too far. Part of patch by Ivan Kalvachev [ikalvachev gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33515 b3059339-0415-0410-9bf9-f77b7e298cf2 Ensure 0-termination even if line does not start with FILE " Part of patch by Ivan Kalvachev [ikalvachev gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33516 b3059339-0415-0410-9bf9-f77b7e298cf2 Only accept regular files as .bin files for .cue files. In particular avoids trying to use directories as .bin when e.g. we failed to extract a filename. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33517 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove a duplicated open() call that could lead to a file-descriptor leak in some cases. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33518 b3059339-0415-0410-9bf9-f77b7e298cf2 Avoid possible crash if cue filename is very short. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33519 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify by using av_strlcpy. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33520 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: Support 9- and 10-bit YUV input for OpenGL VOsreimar2011-07-065-15/+46
| | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33502 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix clear/border color of chroma texture for 9- and 10-bit formats. Avoids pink borders for those formats. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33504 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: vo_direct3d: Mark a function staticdiego2011-07-061-2/+3
| | | | | | | This fixes the warning: libvo/vo_direct3d.c:984:6: warning: no previous prototype for 'vo_draw_alpha_l8a8' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33499 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_asf: Fix play duration calculation errorib2011-07-061-1/+1
| | | | | | | | | | Acording to the ASF documentation, the play duration is zero if the preroll value is greater than the play duration. The new way of determining it (suggested by reimar) prevents overflows as well. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33492 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_delogo: allow to change the rectangle based on the timecigaes2011-07-062-17/+134
| | | | | | | | | | NOTE: the memory for the "file" argument will be leaked; dynamic options are not automatically freed. Not fixing that now as I might implement more general handling later. -uau git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33488 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33498 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: vf_delogo.c: remove tabs to allow direct mergeUoti Urpala2011-07-061-57/+57
| | | | | Remove tab characters to make the file match MPlayer 1 and thus allow directly applying change from there.
* cosmetics: asf.h: Fix comment errorib2011-07-061-1/+1
| | | | | | | | According to the ASF documentation, MF_PD_ASF_FILEPROPERTIES_PREROLL (preroll) is UINT64. Fix type mentioned in comment. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33484 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream dump: print progress informationcigaes2011-07-051-1/+55
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33478 b3059339-0415-0410-9bf9-f77b7e298cf2
* debug output: reduce verbosity of some frequent messagesUoti Urpala2011-07-052-6/+5
| | | | | Drop from frequent (per-frame) messages from DBG2 to DBG3. Drop VDPAU clock adjustment messages from V to DBG2.
* VO: silence "[ASPECT] Warning: No suitable new res found!"Uoti Urpala2011-07-051-1/+1
| | | | | | | | | | The warning "[ASPECT] Warning: No suitable new res found!" was printed from aspect() if the video ended up being downscaled from the original size AND the horizontal direction was the more limiting one for aspect-aware scaling. Also, because aspect() can run multiple times when starting playback this warning could be output multiple times. Change the code so that downscaling alone no longer triggers this message.
* VO: clean up aspect.c, remove aspecttest toolUoti Urpala2011-07-053-136/+44
| | | | | | | | | | Clean up aspect.c code and simplify it somewhat (without changing the overall logic). Replace debug output printf calls under #ifdef with mp_msg() debug output (somewhat modified). Remove the file aspecttest.c which created a binary to test aspect.c functionality. It did not compile and would not be particularly useful anyway. Remove some support lines from aspect.c and Makefile.
* OSD: when switching sub/audio tracks show title of new trackUoti Urpala2011-07-034-12/+33
| | | | | | If the played file has per-track titles for audio and subtitles show those on the OSD when switching tracks. This changes the OSD message from 'Audio: (2) eng' to 'Audio: (2) eng ("Director's commentary")'.
* commands: change property mechanism to use talloc stringsUoti Urpala2011-07-037-140/+91
|
* cosmetics: reformat demux_lavf.c, m_option.[ch] and m_property.cUoti Urpala2011-07-034-2710/+2905
|
* demux: use talloc for sh_* structs and "lang" fieldUoti Urpala2011-07-034-17/+16
|
* cleanup: reindent stheader.hUoti Urpala2011-07-031-100/+102
| | | | Also improve some comments and change two fields from int to bool.
* audio: move ready-for-ao data buffer from decoder to AOUoti Urpala2011-07-026-86/+77
| | | | | | | | | | | | Move the buffer storing audio data ready to be fed to the audio output driver from the audio decoder object to the AO object. This will help encoding code deal with end of input, and may also be useful to improve other general gapless audio behavior (as AOs which do not accept chunks smaller than a certain size may keep them in the buffer while the decoder changes). Less data may be dropped now when changing audio filters or switching timeline parts.
* Makefile: show brief build output by defaultClément Bœsch2011-07-021-0/+7
|
* Makefile: use $(RM) builtinClément Bœsch2011-07-021-21/+20
|
* cleanup: fix mp_dbg() format string warningsClément Bœsch2011-07-015-20/+11
|
* cleanup: mark some vo_directfb2.c and vo_s3fb.c functions staticUoti Urpala2011-06-292-12/+22
|
* Merge branch 'mplayer1_changes'Uoti Urpala2011-06-2932-108/+209
|\
| * subreader: SAMI subs: wrap line if neededreimar2011-06-291-0/+2
| | | | | | | | | | | | | | Start a new line if there's no space left to append to the previous one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33471 b3059339-0415-0410-9bf9-f77b7e298cf2
| * codecs.conf: add fourcc DVOO to rawyuy2cehoyos2011-06-291-0/+2
| | | | | | | | Digital Voodoo SD 8 Bit.
| * codecs.conf: add libavcodec r10k decodercehoyos2011-06-291-0/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33462 b3059339-0415-0410-9bf9-f77b7e298cf2
| * demux_ts: Support S302M audiocehoyos2011-06-291-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33461 b3059339-0415-0410-9bf9-f77b7e298cf2
| * codecs.conf: add S302M audio codec from libavcodeccehoyos2011-06-291-0/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33460 b3059339-0415-0410-9bf9-f77b7e298cf2
| * stream.c: make some stream messages translatableib2011-06-291-6/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33454 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_gl: Request GL_LUMINANCE16 for 16-bit YUV inputreimar2011-06-292-2/+5
| | | | | | | | | | | | | | Request GL_LUMINANCE16 as internal format for > 8 bit YUV formats. Have yet to find a system that actually provides that though. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33453 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_gl: don't accept 9/10-bit formats as inputreimar2011-06-298-58/+74
| | | | | | | | | | | | | | | | | | Make mp_get_chroma_shift() simpler/more generic and add an argument to get the per-component bit depth. Use this to check more properly for supported formats in gl and gl2 vos (only 8 and 16 bit are supported, 9 and 10 are not). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33452 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Windows: stream_cddb.c: include <path.h> for MinGWvayne2011-06-291-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33449 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 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
* | mp_msg: change mp_dbg() to inline function to check syntaxUoti Urpala2011-06-291-3/+8
| | | | | | | | | | | | | | Change mp_dbg() from a macro that is defined to empty when MP_DEBUG is unset to an inline function that has an empty body when MP_DEBUG is unset. This allows the syntax of the calls to be checked even when compiling without MP_DEBUG set.
* | input: clean up messages with button combination namesUoti Urpala2011-06-291-34/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously messages that printed key/button names would have extra names in button combinations appended after the main message, resulting in output like: No bind found for key 'MOUSE_BTN1'.-MOUSE_BTN3 Add a function that creates a complete combination name and use that for all such messages. The above example changes to: No bind found for key 'MOUSE_BTN1-MOUSE_BTN3'. Other affected messages are a input.conf parsing error message and a message about a bound command being invalid.
* | stream/tvi_v4l2: Add V4L2 support for OpenBSD (and NetBSD)Uoti Urpala2011-06-292-0/+15
|/ | | | Patch by Brad <brad@comstyle.com>.
* 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
| | | |<