summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ignore svn change r30269Uoti Urpala2010-01-250-0/+0
|\ | | | | | | Useless internal FFmpeg build stuff.
| * FFmpeg uses ifdef in Makefiles for CONFIG_MPEGAUDIO_HP and ↵reimar2010-01-101-2/+5
| | | | | | | | | | | | | | | | | | | | CONFIG_HARDCODED_TABLES. Change the config.mak generation to take that into account and not generate a definition for these if the features are disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30269 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30268Uoti Urpala2010-01-251-3/+3
|\|
| * Place a volatile at a more appropriate place.reimar2010-01-101-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30268 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change dummy value to fit into int.reimar2010-01-101-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30267 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove return statement from function that has no return value.reimar2010-01-101-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30266 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Skip svn change r30265 (default mp3 decoder change)Uoti Urpala2010-01-250-0/+0
|\| | | | | | | | | The FFmpeg decoder is slower on most machines (integer-only) and has some other problems.
| * Move mp3lib priority below libavcodec mp2/mp3 audio decoders.reimar2010-01-101-14/+15
| | | | | | | | | | | | | | This is meant as a test to see if we can possibly remove mp3lib at some point. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30265 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30264Uoti Urpala2010-01-254-21/+20
|\| | | | | | | | | Conflicts: gui/wm/ws.c
| * Fix OpenGL detection for OpenSolaris where -lXdamage is necessary.reimar2010-01-101-9/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30264 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only print "using sdl-config" if we actually used it for SDL detection.reimar2010-01-101-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30263 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid excessive fflush in dbgprintf if we didn't even print anything.reimar2010-01-101-1/+1
| | | | | | | | | | | | | | Patch by Steinar H. Gunderson [sgunderson bigfoot com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30262 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix RegCloseKey to not return an error on success.reimar2010-01-101-1/+1
| | | | | | | | | | | | | | Patch by "Steinar H. Gunderson" [sgunderson bigfoot com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30261 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Call XSync after XShmAttach to avoid a possible race-condition with shmctl.reimar2010-01-101-0/+1
| | | | | | | | | | | | | | Patch from FreeBSD ports. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30260 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Prefer libdca over libdtsreimar2010-01-101-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30259 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use !isspace() to replace isalnum() to avoid filename mismatch under MBCSzuxy2010-01-101-4/+4
| | | | | | | | | | | | | | | | locale like those in East Asia where most glyphs are neither alphabetical nor numerical. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30258 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Quote test arguments that may be emptyreimar2010-01-101-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30257 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Disable internal copy of liba52 by default, libavcodec should be anreimar2010-01-101-2/+2
| | | | | | | | | | | | | | | | adequate replacement. If there are no complaints we should probably remove it within a few months. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30256 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Ignore svn changes up to r30255Uoti Urpala2010-01-250-0/+0
|\| | | | | | | libswscale changes and useless stuff for internal FFmpeg build.
| * IPv6 in FFmpeg is not supported for MinGW, so do not set CONFIG_IPV6 for ↵reimar2010-01-091-1/+1
| | | | | | | | | | | | that case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30255 b3059339-0415-0410-9bf9-f77b7e298cf2
| * MMX(2) accelerated yuv420->rgb24 routine, trivial as essentially as it justzuxy2010-01-092-98/+118
| | | | | | | | | | | | | | swaps R and B inputs for the existing yuv420->bgr24 routine. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30254 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused PREFETCHW macrozuxy2010-01-092-8/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30253 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add several make variables to make --enable-hardcoded-tables actually compile.reimar2010-01-091-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30252 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for --enable-hardcoded-tables like FFmpeg has.reimar2010-01-091-1/+15
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30251 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30250Uoti Urpala2010-01-257-13/+62
|\|
| * Fix MP1 with demuxer lavf in MPEG (PS) files.cehoyos2010-01-091-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30250 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix fbdev2 to work with Intel framebuffer.reimar2010-01-091-2/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30249 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix vo_fbdev to also work with Intel framebuffer.reimar2010-01-091-4/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30248 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add binary cineform hd vfw decoder to codecs.confcompn2010-01-081-0/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30247 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Ignore 0-height slice in sws_scale, otherwise a final 0-height slice willreimar2010-01-081-0/+4
| | | | | | | | | | | | | | | | cause libswscale to assume the incorrect slice order and complain about slices starting in the middle. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30246 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vf crop: do not generate 0-size slices, they are pointless and also confusereimar2010-01-081-1/+1
| | | | | | | | | | | | | | libswscale to assume the wrong slice order. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30245 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libass needs at least freetype 2.2.1greg2010-01-081-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30244 b3059339-0415-0410-9bf9-f77b7e298cf2
| * mark ffqclp as working in codecs.conf, works on all my samplescompn2010-01-081-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30243 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Update internal libass copy to commit 8db4a5greg2010-01-0824-4782/+7767
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30242 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: Fix indentationcehoyos2010-01-081-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30241 b3059339-0415-0410-9bf9-f77b7e298cf2
| * QCELP is part of libavcodec.cehoyos2010-01-081-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30240 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix libass API checksgreg2010-01-082-2/+2
| | | | | | | | | | | | libass API changed in 0.9.7, not 0.9.8. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30239 b3059339-0415-0410-9bf9-f77b7e298cf2
| * update wishlistcompn2010-01-081-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30238 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync with en/mplayer.1 r30197jrash2010-01-081-3/+30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30237 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vd_ffmpeg: fix compilation with neither VDPAU nor XvMC enabledUoti Urpala2010-01-211-2/+0
| | | | | | | | | | | | | | | | | | The get_format() function was defined under #if CONFIG_XVMC || CONFIG_VDPAU but recent commit ca217f4557c3cff4f2bf33e605ce13e662e84a92 added an unconditional reference to it, causing linking to fail with an undefined reference if neither feature was enabled. Fix by removing the #if, there's no reason reason why it would be needed.
* | vd_ffmpeg: FFmpeg-mt changed has_b_frames API, updateUoti Urpala2010-01-201-1/+2
| |
* | vd_ffmpeg: move redundant info messages to MSGL_V levelUoti Urpala2010-01-201-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Move two messages printed when using VDPAU/XvMC to MSGL_V level: "[VD_FFMPEG] XVMC-accelerated MPEG-2.\n" "[VD_FFMPEG] Trying pixfmt=%d.\n" The first is redundant because this info is normally visible from the decoder name, and it was also incorrectly printed in the VDPAU case too. Add a different MSGL_V message for VDPAU. Also make all these messages not translatable.
* | vd_ffmpeg: disable callbacks for threaded decodingUoti Urpala2010-01-201-38/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPlayer's slice and direct rendering related callbacks are not safe to call from other threads, so disable those features if more than one decoding thread is specified. This should fix some issues when using threaded decoding with formats other than h264 (in the h264 case the callbacks were already disabled for other reasons). This commit moves most of the code that sets special avctx parameters for VDPAU and XvMC. Before that was done after avcodec_open() based on the selected output image format; now it's done before avcodec_open() based on the capabilities of the selected decoder. At least the code selecting the thread count must be before avcodec_open(), and I think there is no reason to try to keep the previous structure otherwise either. The image format-based approach was implemented by Reimar with the intended goal of eventually selecting between software and VDPAU decoders under one FFmpeg decoder type. I consider that goal to be questionable, and the approach certainly made the existing code significantly messier for no functionality benefit.
* | stream: improve EOF handling in seeksUoti Urpala2010-01-182-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset stream 'eof' flag when a seek succeeds, and allow seeking to a position at or past EOF (in the sense that the seek succeeds and stream_tell() then returns that position). This fixes at least some demuxer problems where an attempt to read the index from the end of an incomplete file would set the 'eof' flag and cause subsequent reads to fail, even if failure to read the index would otherwise be nonfatal and demuxing could continue after seeking back. Partially based on a patch from Laurent <laurent.aml@gmail.com>.
* | Avoid misleading error "ASS: cannot add video filter"Uoti Urpala2010-01-164-6/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using libass with a VO that has direct EOSD support the vf_ass video filter is unnecessary and is not added automatically, but the code that adds the filter when it is needed produced misleading output messages in this case. The following two messages were printed at MSGL_ERR level, making it look like an error condition: Couldn't open video filter 'ass'. ASS: cannot add video filter Add a version of vf_open_plugin() called vf_open_plugin_noerr() that does not itself print an error message if opening a vf fails and that returns the exact status code returned by the vf open() function. Make vf_ass return a different status code depending on whether there was an actual error or if it determined a filter would be redundant. Use the _noerr function in the code adding the filter to avoid the first message and check the status code to avoid the second.
* | subtitles: avoid running subreader.c parser when using libassUoti Urpala2010-01-161-19/+22
| | | | | | | | | | | | | | | | | | When loading external subtitle files, the code always tried parsing the file with subreader.c sub_read_file() first, even if libass was then used to parse and render the file (the results of the first parsing would be ignored in that case). This could cause problems like unnecessary error messages. Change the code to try libass parsing first if enabled, and skip subreader.c parsing if that succeeds.
* | subreader.c: fix excessive memory use with some external subtitlesUoti Urpala2010-01-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | For each sequence of consecutive partially overlapping subtitles, the algorithm calculating screen positions for the subtitles allocated a 2*subtitle_count*subtitle_line_count array. With some karaoke subtitles that had lots of rapidly changing overlapping subtitles this became large enough to use gigabytes of memory. Make the behavior saner by limiting the line count to SUB_MAX_TEXT lines (the maximum number of lines to show on screen at once, currently 12). This shouldn't change the end result of the algorithm other than possibly printing different warnings.
* | translations: corrently translate most OSD outputUoti Urpala2010-01-122-50/+54
| | | | | | | | | | | | Add various fixes needed to actually produce translated OSD output. About every OSD string that had a translation macro under the old system should be translatable now.
* | translations: add infrastructure for translated OSD messagesUoti Urpala2010-01-123-10/+26
| | | | | | | | | | | | | | Add function set_osd_tmsg() which is a version of set_osd_msg that translates its format argument. Pass OSD message strings in the command.c property_osd_display table through mp_gtext before they're used.
* | taglists.c: update to match current libavformat riff.cUoti Urpala2010-01-081-1/+22
| |
* | Merge svn changes up to r30236Uoti Urpala2010-01-087-52/+79
|\|
| * Implement sws_isSupportedInput() and sws_isSupportedOutput().stefano2010-01-072-2/+26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30236 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Happy new year!zuxy2010-01-071-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30235 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove const to avoid a bunch of GCC warnings against discarded qualifiers andzuxy2010-01-071-2/+2
| | | | | | | | | | | | | | incompatible pointer type. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30234 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid the error message "Unsupported PixelFormat -1" for ffh264 decodingzuxy2010-01-071-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30233 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support rtmp:// URLs directly instead of requiring ffmpeg://rtmp://reimar2010-01-061-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30232 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify ffmpeg stream support, we (so far) do not need any special option ↵reimar2010-01-061-29/+3
| | | | |