summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* stream.h: remove bad EOF check in stream_seek()Uoti Urpala2010-05-222-3/+0
| | | | Also remove a redundant stream->eof = 0 in demuxer.c.
* demux_mkv: read tags.Anton Khirnov2010-05-224-5/+86
|
* demux: use bstr arguments for demuxer_add_attachment() and demuxer_add_chapter()Anton Khirnov2010-05-224-29/+25
|
* demuxer.c: add demux_info_add_bstr(), use talloc for info fieldAnton Khirnov2010-05-212-15/+18
| | | | demux_info_add() is now a wrapper around demux_info_add_bstr().
* bstr.[ch]: add new files for struct bstr related functionalityUoti Urpala2010-05-206-9/+96
| | | | | | | | Move "struct bstr" definition from ebml.h to its own header and add some utility functions/macros. Change length field type from int to size_t and adjust using code accordingly. Partially based on a patch from Anton Khirnov.
* subreader.c: allow compilation with old FriBiDi 0.10Uoti Urpala2010-05-161-0/+4
| | | | | | | | After fixing the type of the third parameter given to fribidi_log2vis the code didn't compile with old FriBiDi 0.10 any more. Seems that the parameter type has changed in FriBiDi and the type expected by current versions didn't exist in older ones at all. Fix compilation with old FriBiDi by adding an #if based on FRIBIDI_INTERFACE_VERSION.
* ad_pcm: don't rely on demux packets staying validUoti Urpala2010-05-151-9/+23
| | | | | | | | | Change ad_pcm to copy input packet data into an internal buffer instead of relying on the packet still existing at the next decode() call. The extra memcpy could be avoided by improving the demuxer API a bit but I don't feel like implementing that now. Also add a ADCTRL_RESYNC_STREAM handler to drop buffered data from previous stream position.
* ad_pcm: fix crash at EOFUoti Urpala2010-05-151-1/+1
| | | | | | | Fix use of unsigned type where negative values were needed. When playing a file with multichannel PCM audio the bug could result in the channel reorder function scrambling memory at the end of playback, causing a crash.
* cosmetics: reindent ad_pcm.cUoti Urpala2010-05-151-117/+120
|
* vo_vdpau: support queuing an arbitrary number of frames aheadUoti Urpala2010-05-143-43/+83
| | | | | | | | | | | | Make the number of output surfaces allocated by vo_vdpau configurable and allow queuing multiple future frames with the VDPAU frame timing functionality. There are two known issues that could be polished in the future for particularly long queue time cases. First, toplevel code should possibly wait for the queued changes to finish displaying in some situations like switching files. Second, the VO can block waiting for a surface to become available, and in the worst case this wait can be almost as long as the maximum queuing time (potentially causing audio underruns). However those issues are not high priority.
* af_lavcac3enc: make the filter work without FFmpeg internalsUoti Urpala2010-05-142-8/+23
| | | | | | | The only FFmpeg internal symbols required were some constants. Define them in the file itself instead. Also add some checks and fixes to make the code more robust and fix a potential memory corruption problem.
* vo_vdpau: add option for studio level outputUoti Urpala2010-05-122-2/+23
| | | | | | | Add -vo vdpau suboption "studio" to produce output in RGB range 16-235. Man page description mostly taken from a patch by Lauri Mylläri (but not code). Also slightly tweak the description of two other suboptions on the man page.
* vdpau: drop support for old versionsUoti Urpala2010-05-112-6/+1
| | | | | | | | Since I dropped the hack to support older libvdpau versions (without MPEG4 / hqscaling features) from the FFmpeg version used in the build repo it's better to disable those libvdpau versions in MPlayer too. Change the configure check to require a newer libvdpau version, and drop compatibility code in vo_vdpau.c.
* subreader: remove pointless messageUoti Urpala2010-05-081-1/+2
| | | | | | The code printed a pointless "dvdsublang..." message at MSGL_INFO level. Remove that. Add instead a MSGL_DBG2 message showing tested files and their priorities.
* subreader.c: fix fribidi variable typeUoti Urpala2010-05-081-2/+1
| | | | | Use FriBidiParType instead of FriBidiCharType for a variable used as the third argument of fribidi_log2vis().
* mplayer.c: remove an unnecessary #includeUoti Urpala2010-05-081-1/+0
|
* intreadwrite.h: disable optimizationsUoti Urpala2010-05-082-120/+0
| | | | | | Disable arch/compiler specific optimizations in the MPlayer version of intreadwrite.h. All the uses in MPlayer should be irrelevant for performance.
* vd_ffmpeg: remove #ifdef for old FFmpeg-mt versionsUoti Urpala2010-05-071-6/+0
| | | | | The #ifdef is obsolete since trying to compile against the relevant old versions will fail for other reasons.
* Merge svn changes up to r31141Uoti Urpala2010-05-0719-7/+123
|\
| * Remove references to some long-removed files.diego2010-05-071-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31141 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove seemingly misplaced and commented-out liba52 #include.diego2010-05-071-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31140 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for 12-bit color mode on framebuffer devices.cehoyos2010-05-0616-4/+121
| | | | | | | | | | | | | | Patch Janusz Krzysztofik, jkrzyszt A tis icnet pl git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31139 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation with old libschroedinger-dev installed.cehoyos2010-05-061-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31138 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetic: typo, this wasn't supposed to be pluralaurel2010-05-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31137 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove translated strings that are gone from the master translation.diego2010-05-047-21/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31136 b3059339-0415-0410-9bf9-f77b7e298cf2
| * alternative LGPL-licensed, MMX-optimized YUV to RGB conversion routinesdiego2010-05-044-3/+469
| | | | | | | | | | | | | | written by Kostya Shishkov git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31135 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn change r31134Uoti Urpala2010-05-0714-3779/+3769
|\| | | | | | | Fix some search/replace errors introduced in the svn commit.
| * the great MPlayer tab removal: part IIdiego2010-05-0314-3890/+3885
| | | | | | | | | | | | | | some extra indentation fixes are put in as a bonus git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31133Uoti Urpala2010-05-0719-111/+169
|\|
| * Put symlinks under revision control instead of generating them during make.diego2010-05-0314-9/+15
| | | | | | | | | | | | | | This simplifies the build system and should have no practical disadvantage. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31133 b3059339-0415-0410-9bf9-f77b7e298cf2
| * print a more detailed and more useful description of each stream with lavfaurel2010-05-031-6/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31132 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l: correctly use video_stream instead of audio_stream in the video sectionaurel2010-05-031-2/+2
| | | | | | | | | | | | | | ( copy&paste error :( ) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31131 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add ID_..._NAME to -identify for each lavf stream which has a titleaurel2010-05-031-0/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31130 b3059339-0415-0410-9bf9-f77b7e298cf2
| * uniformize handling of aid and vid with lavf so that it matches handling of sidaurel2010-05-031-14/+10
| | | | | | | | | | | | | | | | | | aid and vid are now 0-based, instead of being a globally unique id. This matches the way sid is handled and the way other demuxers manage aid. As a side effect, it slightly simplifies demux_lavf. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31129 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Silence permanent warning messages when decoding H264 over rtsp withcehoyos2010-05-021-1/+6
| | | | | | | | | | | | | | | | | | live555. Patch by Gil Pedersen, gil A cmi D aau D dk git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31128 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Also print OpenGL renderer string with vendor and version with -vreimar2010-05-011-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31127 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Continue probing even for score == AVPROBE_SCORE_MAX / 4 to matchreimar2010-05-011-1/+1
| | | | | | | | | | | | | | FFmpeg's behaviour. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31111 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use av_probe_input_format2 and avoid accepting detectionreimar2010-05-011-2/+5
| | | | | | | | | | | | | | while the score is still low. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31110 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert accidental change to default CFLAGS.reimar2010-04-301-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31109 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add configure detection for SDL backend for -vo gl.reimar2010-04-301-78/+111
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31108 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid duplicating the GL/gl.h include.reimar2010-04-301-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31107 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, open the customtex also in binary mode, not just the program.reimar2010-04-301-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31106 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Skip svn change r31105Uoti Urpala2010-05-070-0/+0
|\|
| * Fix compilation with gcc 2.95.3 (with --disable-ass).cehoyos2010-04-281-0/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31105 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31104Uoti Urpala2010-05-072-2/+15
|\|
| * New hack for vobsub packet merging.iive2010-04-271-0/+13
| | | | | | | | | | | | | | | | | | It seems that if there is no padding between packets then they actually belong to one subtitle picture. The new hack seems to work far more reliable than the (already removed) old one. Patch by Ubitux (gmail) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31104 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move variable declaration into the block where it is actually used.reimar2010-04-271-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31103 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Skip svn changes up to r31102Uoti Urpala2010-05-070-0/+0
|\| | | | | | | Fix already done in git and FFmpeg build stuff.
| * Add llrintf test for FFmpeg.diego2010-04-271-1/+2
| | | | | | | | | | | | | | patch by Michael Kostylev, michael.kostylev gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31102 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing input.h #include, fixes the warnings:diego2010-04-271-1/+1
| | | | | | | | | | | | | | | | libvo/video_out.c:461: warning: implicit declaration of function 'mp_input_queue_cmd' libvo/video_out.c:461: warning: implicit declaration of function 'mp_input_parse_cmd' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31101 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31100Uoti Urpala2010-05-073-3/+3
|\|
| * Move "screen" variable declaration below the relevant #ifdef, fixes the warning:diego2010-04-271-1/+1
| | | | | | | | | | | | | | libvo/x11_common.c:369: warning: unused variable 'screen' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31100 b3059339-0415-0410-9bf9-f77b7e298cf2
| * fix typoGabrov2010-04-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31099 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation with live555 after libavutil r22965.cehoyos2010-04-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31098 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vo_vdpau.c cosmetics: add WRAP_ADD macroUoti Urpala2010-05-061-6/+9
| | | | | | | | | | The macro is meant to simplify the handling of some code dealing with circular buffers.
* | vd_ffmpeg: use skip_frame instead of deprecated hurry_up fieldUoti Urpala2010-05-041-1/+6
| |
* | demux_y4m: fix failure with nonseekable inputUoti Urpala2010-04-301-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Playback of nonseekable y4m streams was broken by a change merged from svn, r30970 which added support for multiple yuv4mpeg files concatenated together. The change included a stream_skip(stream, -1) call which only works for seekable files. Work around this by disabling the concatenated-file check for nonseekable streams. This means concatenated files are only supported if the stream is seekable, but this is an improvement compared to the svn commit which caused a regression making _all_ files fail in the nonseekable case. It would be reasonably easy to make the concatenation support work in all cases, either by modifying demux_y4m or (probably better) adding a general stream API to allow pushing back the read byte. However for now I'm only fixing the regression with the above trivial change.
* | Merge svn changes up to r31097Uoti Urpala2010-04-2630-278/+627
|\|
| * synced with r31096Gabrov2010-04-259-40/+218
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31097 b3059339-0415-0410-9bf9-f77b7e298cf2
| * typo fixesGabrov2010-04-251-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31096 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set vo_dwidth/vo_dheight for mouse movements work at least in windowed mode.reimar2010-04-251-0/+2
| | | | | | | | | | | | | | For fullscreen, vo_screenwidth/vo_screenheight have to be set correctly still. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31095 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try other methods also if GetBusKey fails instead of failing completely.reimar2010-04-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31094 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Missing space after if.reimar2010-04-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31093 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support mouse movements in SDL.reimar2010-04-251-1/+4
| | | | | | | | | | | | | | Currently for some reason broken with -vo sdl. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31092 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid duplicating mouse-movement command-generation code.reimar2010-04-255-17/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31091 b3059339-0415-0410-9bf9-f77b7e298cf2