summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r29962Uoti Urpala2009-11-2348-482/+637
|\
| * Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too manyreimar2009-11-2214-23/+23
| | | | | | | | | | | | | | name clashes, in particular with Windows headers (which define STREAM_SEEK as an enum type). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29962 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Some MinGW awk versions can not handle reading from files with CRLFreimar2009-11-220-0/+0
| | | | | | | | | | | | | | line-ending, so force this file to always use just LF git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29961 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, forgot to apply vo_w32_get_dc/vo_w32_release_dc declarations in ↵reimar2009-11-221-0/+2
| | | | | | | | | | | | | | | | | | w32_common.h Should fix compilation on MinGW. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29960 b3059339-0415-0410-9bf9-f77b7e298cf2
| * av_alloc_format_context -> avformat_alloc_contextreimar2009-11-221-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29959 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix initialization values for vf_expand priv struct.reimar2009-11-221-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29958 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused variable.reimar2009-11-221-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29957 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add const to draw_slice argument to match what FFmpeg expects for ↵reimar2009-11-221-2/+2
| | | | | | | | | | | | draw_horiz_band. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29956 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Switch ad_ffmpeg to avcodec_decode_audio3reimar2009-11-221-1/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29955 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused variable.reimar2009-11-221-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29954 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reuse buffer in priv context instead of allocating the 32kB probe bufferreimar2009-11-221-4/+3
| | | | | | | | | | | | | | on the stack. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29953 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix crash with partial fribidi conversion.reimar2009-11-221-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29952 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mention right-to-left support for embedded subtitles also in the Changelog.reimar2009-11-221-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29951 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make fribidi (i.e. right-to-left) support work with embedded subtitles.reimar2009-11-221-3/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29950 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Synced with help_mp-en.h r29912jrash2009-11-211-213/+214
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29949 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print which visual glXChooseVisual chose when running in verbose mode.reimar2009-11-211-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29948 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move OpenGL-related messages that have large output from MSGL_V to MSGL_DGB2.reimar2009-11-211-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29947 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for Windows OpenGL rendering onto a device instead of into a window.reimar2009-11-213-8/+48
| | | | | | | | | | | | | | | | | | Has little use except for experimenting - on Windows 9x it could be used to render on monitors that were not managed by Windows, but that feature was removed in newer Windows versions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29946 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unreachable parsing code: for filters that use the option parser,reimar2009-11-217-135/+0
| | | | | | | | | | | | | | | | the args argument to open will always be NULL and vf->priv will always be != NULL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29945 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support RGB48NE format in OpenGL vos (only really useful once they are modifiedreimar2009-11-211-0/+4
| | | | | | | | | | | | | | to actually use GLX/WGL visuals with more than 8 bits per component if available). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29944 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow vf_scale to output to RGB48, though still prefer the 24 and 32 bit ↵reimar2009-11-211-0/+2
| | | | | | | | | | | | formats. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29943 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support 16-bit-per-component RGB formats (rgb48[bln]e) in option parser.reimar2009-11-211-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29942 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a define for IMGFMT_RGB48NE that depends on machine endianness.reimar2009-11-211-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29941 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move 128kB buffer from stack to demuxer context.reimar2009-11-201-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29940 b3059339-0415-0410-9bf9-f77b7e298cf2
| * calloc instead of malloc+memset.reimar2009-11-201-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29939 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use calloc to allocate a rather large (currently 32k) array instead ofreimar2009-11-201-1/+2
| | | | | | | | | | | | | | putting it on the stack, performance should not matter much here. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29938 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sub_fribidi should be static, it is not used outside subreader.creimar2009-11-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29937 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use early return instead of block over whole function.reimar2009-11-201-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29936 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use FFMAX instead of a custom max macro.reimar2009-11-201-4/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29935 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Silence two gcc warnings: suggest parentheses around && within ||cehoyos2009-11-181-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29934 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add #defines for FFMPEG_LICENSE and FFMPEG_CONFIGURATION to config.h.diego2009-11-181-0/+3
| | | | | | | | | | | | | | This is necessary to sync up with some recent FFmpeg changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29933 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add functions to return library license and library configuration.diego2009-11-182-0/+21
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29932 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l to Reimar: Fix typo.cehoyos2009-11-181-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29931 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Deobfuscate the special hack to disable cache for live555.reimar2009-11-173-2/+6
| | | | | | | | | | | | | | | | | | Cache can not be used for it, since it does not provide any data stream, the data is provided to the demuxer "behind MPlayer's back". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29930 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge malloc+memset -> callocreimar2009-11-171-4/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29929 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fall back to read-based seeking for ffmpeg:// URLs when is_streamed is setreimar2009-11-171-2/+2
| | | | | | | | | | | | | | (i.e. it is not possible to use url_fseek). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29928 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless check for valid fd with -dumpstream, the code does notreimar2009-11-171-4/+0
| | | | | | | | | | | | | | necessarily need it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29927 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Enable the read-based forward seek fallback also when CONFIG_NETWORK isreimar2009-11-171-2/+2
| | | | | | | | | | | | | | | | | | enabled. Enabling network support should not have side-effects on code not really related to networking. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29926 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use fill_buffer if available also for STREAMTYPE_STREAMreimar2009-11-171-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29925 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mention support for streaming via FFmpeg in Changelog (ffmpeg:// URLs).reimar2009-11-171-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29924 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add preliminary support for streaming via FFmpeg's URProtocol functions.reimar2009-11-173-1/+147
| | | | | | | | | | | | | | Basic playback tested for file and http protocols. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29923 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Complete configure support for compiling in FFmpeg's protocol support.reimar2009-11-171-0/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29922 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use avcodec_align_dimensions to appropriately align width and height inreimar2009-11-171-5/+2
| | | | | | | | | | | | | | get_buffer instead of reimplementing it badly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29921 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set display size in sh_video when decoding H264.cehoyos2009-11-161-0/+2
| | | | | | | | | | | | | | This fixes H264 VDPAU decoding with some native demuxers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29920 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Clarify new VDPAU MPEG4 ASP and DVB teletext decoding features.cehoyos2009-11-161-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29919 b3059339-0415-0410-9bf9-f77b7e298cf2
| * synced with r29912Gabrov2009-11-163-34/+98
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29918 b3059339-0415-0410-9bf9-f77b7e298cf2
| * synced with help_mp-en.h r29912ptt2009-11-161-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29917 b3059339-0415-0410-9bf9-f77b7e298cf2
| * added -name, -title, -use-filename-title options to Changelogptt2009-11-162-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29916 b3059339-0415-0410-9bf9-f77b7e298cf2
| * more changescompn2009-11-161-2/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29915 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use calloc instead of initializing each struct member individually to 0.reimar2009-11-161-22/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29914 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try to detect broken files with unaligned chunks.reimar2009-11-162-0/+16
| | | | | | | | | | | | | | | | | | This patch hopefully makes them playable as long as they have and index without breaking any other files. Fixes http://samples.mplayerhq.hu/avi/invalid_unaligned.avi with native demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29913 b3059339-0415-0410-9bf9-f77b7e298cf2
* | core: Do OSD/subtitle updates at a more accurate pointUoti Urpala2009-11-221-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OSD contents such as video position and non-libass subtitles were updated just before feeding a video frame through filters. The updates were done at that point mainly for the benefit of vf_expand OSD rendering functionality, which draws the OSD contents when the frame passes through that filter. However this gave the wrong results for VO-drawn OSD if the filter chain or VO had any delay or timestamp manipulation: the OSD contents should reflect the most recent contents that were _output_ after any filtering, not the last frame that was fed _into_ the filtering machinery. This issue became more important after vo_vdpau started buffering frames by default. Move the OSD updates to be done just before the OSD is drawn, using the most accurate available information. This fixes the common case but worsens vf_expand OSD behavior (adding extra latency). A special case could be added to fall back to the previous behavior when vf_expand OSD is being used; however I don't consider that a high priority at the moment especially when other problems with vf_expand OSD would still remain. This has little effect on libass-rendered subtitles either way, because both vf_ass and VO libass rendering use timestamps from the filter chain and do not rely on separate position updates.
* | af_scaletempo: Fix delay value after changing scale to 1Uoti Urpala2009-11-221-0/+1
| | | | | | | | | | | | | | | | | | | | The scaletempo filter has a special-case check to return the samples unchanged if the current scaling factor is 1. In this case code setting af->delay wasn't run. If the scale had had a different value and then been changed to 1 as a result of a playback speed change then the delay field could have a nonzero value left, resulting in A/V sync errors. Fix by setting the delay field to 0 in the scale == 1 special case code.
* | core: Add support for decoder reordering of pts valuesUoti Urpala2009-11-218-9/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a mode where libavcodec's reordered_opaque feature is used to associate container packet timestamps with decoded frames. This should improve behavior at least for MPEG files with interlaced h264; the previous code does not cope well with the libavformat demuxer producing two field packets with separate timestamps but the libavcodec h264 decoder only producing a single output frame for those two packets (so half the timestamps have no associated output frame). The current libavformat mpeg demuxer seems to finally work with interlaced h264 files and produce valid timestamps which are useful with a mode like this. By default MPlayer now selects between this new mode and the old one automatically based on the number of timestamp problems they cause; by default the new mode is used if both seem to work. The new option -pts-association-mode can be used to force a particular mode. If correct-pts mode is disabled this has no effect on timing. Also remove the "EXPERIMENTAL" marker from the manpage description of -correct-pts.
* | VO: Keep aspect by adding black bars in window mode too if necessaryUoti Urpala2009-11-202-3/+7
| | | | | | | | | | | | | | | | | | By default (without -nokeepaspect) MPlayer tries to maintain video aspect ratio by using window manager hints to keep output window aspect when resizing. Before this commit it would however scale the video to completely fill the window even if the window manager did not respect those hints. Change the behavior to add black bars like in fullscreen mode instead in this case.
* | vo_vdpau: Check return value when setting video mixer featuresUoti Urpala2009-11-171-3/+6
| |
* | cosmetics: remove some unused variablesUoti Urpala2009-11-175-8/+0
| |
* | vo_vdpau: Check return value when setting video attributesUoti Urpala2009-11-171-24/+24
| | | | | | | | | | | | | | Check the return valu