summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* codecs.conf: cleanup: remove stale entrywm42012-10-301-8/+0
|
* demux_lavf: add a hack to work around other hackswm42012-10-304-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | mplayer (and all forks) use a single FourCC field to map codecs. This is what sh_video->format and sh_audio->format is used for. Basically it's a key into the codecs.conf table to find out what decoder to use. (There's only one video codec and one major audio codec left - both libavcodec. But we still have to deal with mapping coming from non-libavformat demuxers.) It seems this causes some video codecs to fail, such as WV1F in AVI [1]. demux_lavf generally throws away the codec_tag from libavformat if the codec is MPEG-in-AVI. There are probably other cases like this. Add a hack to enforce passing the correct codec tag when only ffmpeg demuxers and decoders involved. Note: the sample [1] needs to be flipped. With --demuxer=avi, this is done correctly, because unlike demux_lavf, the demuxer uses the FourCC directly for the sh_video->format tag, and finds the correct codecs.conf entry (which contains the flip flag). We could just add a "whitelist" of codec tags which can be passed through to sh_video->format, but I don't want to do that just for such an obscure format as the sample at hand. Note 2: when demux_lavf is used, the AVCodecContext could be passed directly to vd_ffmpeg/ad_ffmpeg. The code to convert to/from the internal mplayer stream headers is probably still needed, as there are non-ffmpeg demuxers and audio decoders. [1] http://samples.mplayerhq.hu/V-codecs/WV1F/AVI/title2.avi
* configure: bump required ffmpeg library versionswm42012-10-301-1/+1
| | | | | | | | libavutil: for av_get_packed_sample_fmt() libavcodec: for avcodec_encode_video2() It's actually untested whether these are really the minimum required versions. I didn't want to bump them further yet.
* input: remove default bindings for sub_stepwm42012-10-301-2/+2
| | | | | The sub_step command is not that useful, and accidentally hitting it means that the subtitle delay gets completely messed up.
* command: make property "deinterlace" unavailable if deinterlacer absentwm42012-10-301-3/+5
| | | | | | | | | The "deinterlace" property was stuck at "no" if there wasn't actually any switchable deinterlacer (like yadif or vdpau) in the video chain. Also, take care of returning only 0/1 values. It appears yadif and vdpau return their current deinterlacer mode, which is not always the value 0 or 1.
* options: remove --hr-mp3-seekwm42012-10-303-12/+0
| | | | | | | This didn't do anything anymore. Even before the internal audio demuxer was removed, demux_lavf was used by default for mp3. Use --hr-seek instead.
* options: remove --adapterwm42012-10-306-34/+0
| | | | | This probably didn't do anything. Maybe OpenGL VOs on win32 actually could make use of it, but even then it probably didn't work.
* cleanup: remove M_OPT_NOCMDwm42012-10-302-13/+2
| | | | Unused.
* manpage: -benchmark was renamed to -untimedwm42012-10-301-0/+1
|
* options: rename -ni to -avi-niwm42012-10-305-4/+5
| | | | | | | | The -ni option does something with the AVI demuxer only. Also fix misleading error messages when the packet queue overflows (it suggests using -ni, which in the typical case of playing NI AVI files will not work, as demux_lavf is used by default).
* options, avi: remove -loadidx/-saveidxwm42012-10-305-78/+0
| | | | This was probably useless even many years ago.
* cleanup: remove references to CONFIG_TV_DSHOWwm42012-10-302-16/+3
|
* cleanup: remove references to CONFIG_XVID4wm42012-10-301-4/+0
|
* screenshot: printf format "%.*s" takes an int, not ptrdiff_twm42012-10-301-1/+1
|
* stream: fix redirection for proxy URLsreimar2012-10-303-15/+55
| | | | | | | | | | | Fix redirection for proxy URLs. Should fix bug #2091. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35207 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: stream/url.c
* url: simplifycboesch2012-10-303-25/+43
| | | | | | | | | | | | | | | | | | | | Use mp_asprintf in make_noauth_url and make_http_proxy_url. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32971 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: cboesch Conflicts: stream/url.c Note: the mp_asprintf() function was introduced in r32970, and put into its own files. We just put that directly into url.c, as we use talloc_asprintf() in general, and mp_asprintf() is for url.c code only. (Making url.c use talloc would probably result in a big mess.) Make proxy and url parameter const in get_noauth_url and get_http_proxy_url. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32972 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: cboesch
* libmpcodecs: fix coverity issuesreimar2012-10-305-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix check for empty log file (n contains a start offset of 15). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35269 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Add missing (). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35270 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Conflicts: libmpcodecs/vf_down3dright.c Add comment to silence coverity (and it generally doesn't hurt to make intentional fallthrough cases explicit). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35271 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Make uninit function handle vf->priv being NULL. This happens in the case where memory allocation for it fails. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35272 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Remove useless variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35273 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Conflicts: libmpcodecs/vf_softpulldown.c
* stream: add STREAM_CTRL_GET_CURRENT_TITLEib2012-10-304-0/+14
| | | | | | | | Add new stream control command STREAM_CTRL_GET_CURRENT_TITLE for DVDs. This provides the current title (aka track) number of a DVD. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35263 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache: enable STREAM_CTRL_GET_NUM_TITLESib2012-10-301-0/+3
| | | | | | | | Allow STREAM_CTRL_GET_NUM_TITLES with cache enabled. This is missing in r34474. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35258 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_screenshot: fix handling of out-of-order slice rendered framesreimar2012-10-301-4/+2
| | | | | | Fix handling of out-of-order slice rendered frames. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35208 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_delogo, vf_unsharp: clear mpi->priv for consistencyreimar2012-10-302-0/+2
| | | | | | For consistency clear mpi->priv after it was used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35203 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_delogo: fix using with numbered mpireimar2012-10-301-1/+4
| | | | | | | | Fix delogo filter with numbered mpi. Should fix bug #2087. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35202 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_ts: fix reading teletext languagereimar2012-10-301-1/+1
| | | | | | | Fix reading language from teletext descriptor when it is not the first descriptor in the block. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35198 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_ts: cosmeticsreimar2012-10-301-10/+10
| | | | | | | | | | Remove "inline" from functions that are definitely not absolutely critical for performance. The compiler should be able to make a more intelligent decision on its own. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35197 b3059339-0415-0410-9bf9-f77b7e298cf2
* mp_image: update description of MP_IMGFLAG_READABLEreimar2012-10-301-1/+8
| | | | | | Update description of MP_IMGFLAG_READABLE. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35150 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf: fix usage count for passthrough-only filtersreimar2012-10-301-1/+3
| | | | | | | | | Fix usage count for passthrough-only filters. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35135 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libmpcodecs/vf.c
* vd_ffmpeg: detect broken mpi usage countreimar2012-10-301-0/+4
| | | | | | Detect broken mpi usage count also in decoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35134 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer: add missing newline in error messagecehoyos2012-10-301-1/+1
| | | | | | Add missing newline in error message. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35120 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache: fix long hangsreimar2012-10-301-1/+1
| | | | | | | | | | Avoid sleeping 0 ms, this can cause sleep to be not called at all. This will then cause long hangs e.g. when sleeping on single-CPU/core computers. Should fix bug #2084. Patch suggested by Visenri [visenri yahoo es] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35119 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_lavf: support SRT subtitlesreimar2012-10-301-2/+2
| | | | | | | | | | | Support subrip format subtitles. Patch by Philip Langdale [philipl overt org]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35118 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libmpdemux/demux_lavf.c
* demux_lavf: do not special case ID_TEXT subs on program switchingreimar2012-10-301-1/+1
| | | | | | | | | | | | | | When switching programs select subtitle stream regardless of whether the format is text, ASS, bitmap or whatever. There probably was some good reason for the condition but it got lost in time and special-casing CODEC_ID_TEXT over other test-based subtitles doesn't seem to make much sense. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35117 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libmpdemux/demux_lavf.c
* stream_file: explicitly signal EOFreimar2012-10-301-0/+2
| | | | | | | | | Explicitly signal EOF when reaching the end of a file/pipe. Fixes a 4 second delay due to stream_reconnect for e.g. echo | mplayer - git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35112 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_ts: add support for PCM variant found on BluRayreimar2012-10-301-0/+7
| | | | | | TS demuxer: Add support for PCM variant found on BluRay. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35106 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_stereo3d: add another anaglyph color variantreimar2012-10-301-12/+30
| | | | | | | | | | | | | | | | | | | | | | | Make compiler give the ana_coeff array automatically the right size. Makes adding more colour schemes easier. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35078 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Convert comments into designated initializers. That is a simple way to ensure they always correspond to what the compiler actually does. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35079 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Add another anaglyph color variant. Patch by Bob [mpbob ezpi net]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35080 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* vf_expand: remove outdated code causing crashesreimar2012-10-301-6/+0
| | | | | | | | | | | | | | | | | Remove outdated code that instead of preventing now causes crashes. The problem it was trying to catch (next filter not supporting slices) was fixed already in r10141 (by implementing a fallback version of vf_next_draw_slice). This should fix Debian Bug#683907. Example command-line: mencoder big_buck_bunny_480p_stereo.avi -o a.mpg -vf crop=346:240:2:24 -oac copy -ovc lavc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35061 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Conflicts: libmpcodecs/vf_expand.c
* options: fix URL user/password parsingUoti Urpala2012-10-301-2/+2
| | | | | | | Code parsing the optional user/password part for some URL types given as files to play, such as "ftp://user:password@host/filename", was broken. Fix. I guess this isn't used much as nobody reported it earlier.
* stream_ftp: fix double free in one error caseUoti Urpala2012-10-301-1/+0
|
* af_scaletempo: reset latency info when reconfiguringUoti Urpala2012-10-281-0/+3
| | | | | | | | af_scaletempo kept outdated values in the af->delay field after reconfiguration until some audio was fed through the filter. This could affect audio sync code after a playback speed change. Additionally, in the special case speed=1 the code did not set the af->mul field at all. Initialize both fields after reconfiguration.
* stream_ffmpeg: handle rtsp:// URLs by default, add lavf://Uoti Urpala2012-10-283-22/+31
| | | | | | | | | | | Make stream_ffmpeg handle rtsp:// URLs by default, without requiring ffmpeg://rtsp://. Previously (after removal of other rtsp implementations) rtsp:// fell back to using HTTP, which was unlikely to work. Also add lavf:// as an alternative to ffmpeg:// to force the stream implementation. Since libavformat can come from Libav rather than FFmpeg, using the ffmpeg name in the prefix is misleading.
* cleanup: remove vd_internal.hwm42012-10-231-48/+0
| | | | This was stupid crap for old vd_* files, and vd_ffmpeg doesn't need it.
* vo_opengl: fix help output typowm42012-10-231-1/+1
|
* VF: remove IMGFMT_MPEGPESwm42012-10-226-20/+2
| | | | | | | | | This wasn't used anymore. Remove the reference to IMGFMT_MJPEG in vf_dlopen as well. Thus format is used as FourCC in the TV code (i.e. it's on the demuxer level, just like raw formats), and never appears in the video filter chain. For starters, vd_ffmpeg can never produce this format.
* vd: remove references to vf_palette and vf_lavcwm42012-10-221-48/+3
| | | | | | Both of these video filters have been deleted. There wasn't any use-case left where these were needed. Videos with paletted pixel formats still work.
* vd_ffmpeg, vf: fix crashes with some game formatsreimar2012-10-222-5/+8
| | | | | | | | | | | Fixes for palette allocation handling. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34304 b3059339-0415-0410-9bf9-f77b7e298cf2 This caused a crash with http://samples.ffmpeg.org/cdxl/fruit.cdxl if direct rendering was used. (Which is rarely these days.) With small changes: avoid av_freep() use, as this function is not sane.
* osd_libass: increase robustness when handling internal OSD escapeswm42012-10-221-1/+1
| | | | | | | | | | | | | | The \xFF escape is used internally to insert special OSD symbols (which need a font change to the internal OSD font). There was potential for breakage when \xFF was followed by \0, because then "in" would be advanced past the string's end. Normally this can't happen, as it would require invalid UTF-8 input data. But we don't check input for UTF-8 validness, so there's a potential issue here. Garbled output is ok on invalid UTF-8 input, but crashing is not. Make it more robust by checking for this.
* osd_libass: fix stupid dangling pointer crashwm42012-10-221-1/+1
| | | | | | | | | | append_utf8_buffer() reallocates the buffer passed to it, and returns the new pointer. This bug was originally introduced in mplayer2 when that project merged mpv's osd_libass.c. That merge changed some minor things, including ASS escape handling. When mpv used this better method of escape handling too (commit 0ff7dd992fb0), the bug was duplicated.
* mp_image: add IMGFMT_BGR0/PIX_FMT_BGR0wm42012-10-214-0/+10
| | | | Needed by ffv1.
* vo_vdpau: fix screenshotswm42012-10-211-18/+32
| | | | | | | | | | | | | | | | Attempting to take screenshots printed vdpau errors on the terminal, and the resulting screenshots were filled with black. The problem was that that the screenshot code tried to use an unallocated output surface (the one at vc->output_surfaces[vc->num_output_surfaces]). This used to refer to the last allocated surface, until this was changed by a recently merged commit. That commit also added a separate screenshot surface. The merge somehow went wrong, and that part was not integrated. <uau> wm4: you used an earlier buggy version of a commit OK...
* mplayer: make terminal status playback time consistent with OSDwm42012-10-211-14/+8
| | | | | | | | Always use the same function as the OSD does (get_current_time()). This loses the logic to display "???" if the time is unknown, as get_current_time() returns 0 in this case. (The function has far too many uses to change that now, and it seems to happen rarely in practice.)
* build: fix compilation on Windows (manifest files)wm42012-10-203-3/+3
|
* VO: fix screenshot size with -geometrywm42012-10-204-24/+8
| | | | | | | | | | The -geometry switch works by modifying the d_width/d_height values passed to VOs. Moreover, d_width/d_height seem to be subject to the -monitorpixelaspect option. Screenshots should not be influenced by this. Change screenshot supporting VOs to use the original d_width/d_height values stored in vo->aspdat.prew/h. (Not all uses of -geometry did this. E.g. --geometry=900x560+0+20 did.)
* gl_common: hack to support compilation on FreeBSDwm42012-10-201-0/+12
| | | | | | It seems FreeBSD 10.0-CURRENT as of this time doesn't include the GLX extension and header file definitions for creating OpenGL 3.x core contexts. Dump some more hacks into gl_header_fixes.h.
* cocoa_common: avoid situational nil dereferencingStefano Pigozzi2012-10-191-2/+3
|
* cocoa_common: use the same window level when windowed and fullscreenStefano Pigozzi2012-10-161-17/+7
| | | | | | | | This greatly simplifies the code and makes alt tab behave like it is supposed to: it doesn't put the mplayer window behind the other ones when losing focus. If you have other programs that are displaying themselves above the normal window level, avoid them or use --ontop.
* cocoa_common: split window creation in helper functionsStefano Pigozzi2012-10-161-88/+112
| | | | This commit hopefully makes it easier to follow the flow of the program.
* cocoa_common: cosmetics / reformatStefano Pigozzi2012-10-161-87/+118
| | | | | Use 80columns almost exclusively and reformat Objective-C messages declarations to follow Apple's style (i.e.: - (int)name; instead of - (int) name;).
* gl_common: remove useless cocoa wrapper functionsStefano Pigozzi2012-10-161-18/+3
|
* cocoa_common: remove useless importStefano Pigozzi2012-10-161-2/+0
| | | | | QuartzCore was probably forgot after extracting the code from `vo_corevideo`. The OpenGL.h include can be avoided with no warnings/errors.
* cocoa_common: replace TickCount() with NSProcessInfo#systemUptimeStefano Pigozzi2012-10-161-4/+3
| | | | | TickCount is depracted in OS X 10.8. Substitute it with a public Cocoa API call available since OS X 10.6.
* cocoa_common: use IOKit to perform power managementStefano Pigozzi2012-10-168-12/+80
| | | | | | This allows to remove the call to the deprecated `UpdateSystemActivity`. The additional benefit is power management is disabled only if the video is really playing. A paused video will not stop the system from idling.
* cocoa_common: save state in the vo structStefano Pigozzi2012-10-165-62/+85
| | | | | Save the cocoa state in an instance variable for the Objective-C part of the code and use a field in the vo struct for the raw C part of the code.
* codecs: add Video Decode Acceleration Framework codecStefano Pigozzi2012-10-161-0/+16
| | | | | | | | | | Video Decode Acceleration Framework is a framework by Apple to provide GPU assisted H.264 decoding. It is available on Mac OS X v10.6.3 and later with Mac models equipped with the NVIDIA GeForce 9400M, GeForce 320M, GeForce GT 330M, ATI HD Radeon GFX, Intel HD Graphics and others. This commit uses the new video decoder added in FFmpeg based upon this framework.
* TOOLS: add script for osx bundle generationStefano Pigozzi2012-10-1613-0/+913
| | | | | | | | | | | | | Add a make task and python script to create a Mac OS X Application Bundle to be used when compiling with the --enable-macosx-finder and --enable-macosx-bundle configure flags. The main svg icon was created by me and heavily inspired by Apple's iTunes and AppStore i