summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
Commit message (Collapse)AuthorAgeFilesLines
* vf_ass: Free private data at uninitUoti Urpala2009-03-311-0/+1
|
* Merge svn changes up to r28951Uoti Urpala2009-03-148-2270/+49
|\
| * Check for HAVE_EBX_AVAILABLE before enabling MMX code that needs the EBX ↵reimar2009-03-132-4/+4
| | | | | | | | | | | | | | | | | | register. Makes things a bit simpler for everyone who insists on compiling MPlayer as PIE-code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28942 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use the same code as in vf_decimate to select diff_MMXreimar2009-03-131-3/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28941 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing ecx clobber in diff_MMX code (yes, that function is duplicated).reimar2009-03-132-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28940 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of nuppelvideo.h and its ugly packed struct and instead write thereimar2009-03-091-18/+17
| | | | | | | | | | | | | | frame header directly in nuv encoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28914 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix type of zlen, fixes crashes on 64 bit systems.reimar2009-03-091-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28912 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not calculate the same value twicereimar2009-03-091-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28911 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allocate buffer for lzo compression correctly also for large frame sizes.reimar2009-03-091-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28910 b3059339-0415-0410-9bf9-f77b7e298cf2
| * nuv encoder 64 bit fix: avoid using long/sizeof(long)reimar2009-03-091-5/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28909 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove internal NuppelVideo decoder, the code in libavcodec can decodereimar2009-03-085-1552/+0
| | | | | | | | | | | | | | those files and some more and is far more maintainable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28888 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of pointless debugging codereimar2009-03-081-18/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28887 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove the grayscale and 4:2:2 RTjpeg code, it is neither used nor is therereimar2009-03-081-257/+0
| | | | | | | | | | | | | | anything special about to to justify preserving it for documentation purposes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28886 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove colourspace-conversion stuff from rtjpeg, we have functions to do thatreimar2009-03-081-384/+0
| | | | | | | | | | | | | | better and it doesn't belong in that file anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28885 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark everything not used outside the file as "static"reimar2009-03-081-36/+36
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28884 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove functions not used by MPlayer from headerreimar2009-03-081-15/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28883 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless "extern" in function declarations.reimar2009-03-081-22/+22
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28882 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28862Uoti Urpala2009-03-071-19/+27
|\|
| * Add some "const" to mpcodecs_vd_driversreimar2009-03-062-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28861 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Swap order of VFCTRL_DRAW_EOSD and VFCTRL_DRAW_OSD so that the EOSD is drawnreimar2009-03-061-1/+4
| | | | | | | | | | | | | | | | below the OSD and document possible issues when this is changed. Patch by Uoti (though originally intended for a different issue) with extra comment by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28841 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add another hack to work-around the currently completely inconsistent way inreimar2009-03-031-1/+5
| | | | | | | | | | | | | | which libavcodec sets AVCodecContext::pix_fmt. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28801 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l, replace a tab that slipped in.reimar2009-03-011-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28767 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Create a set_format_params function that sets all the special options neededreimar2009-03-011-19/+23
| | | | | | | | | | | | | | | | | | for XvMC/VDPAU acceleration in a single place. This should get closer to working with selecting acceleration via pix_fmt instead of via a special codec for each method. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28766 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28712Uoti Urpala2009-02-231-0/+2
|\|
| * Set time_base to 1/samplerate, like FFmpeg does, instead of leaving it at thediego2009-02-211-0/+2
| | | | | | | | | | | | | | | | default 0/1. This is not required by a lot of codecs, but at least by libvorbis. patch by Nicolas George, nicolas.george normalesup org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28695 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28690Uoti Urpala2009-02-212-6/+2
|\|
| * Remove unused and unreachable code hunk that was surrounded by a misspelleddiego2009-02-191-4/+0
| | | | | | | | | | | | | | preprocessor condition. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28663 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Return PIX_FMT_NONE if the video system refuses all other formats.iive2009-02-191-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28662 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28655Uoti Urpala2009-02-193-0/+5
|\|
| * Add VOCAP_NOSLICES and use it to allow vo_vdpau to not support slices forreimar2009-02-182-0/+4
| | | | | | | | | | | | | | | | YV12 - since VDPAU only has functions to upload the full frame at once there is no sense in supporting draw_slice for that. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28646 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Handle mpcodecs_get_image returning NULL, FFmpeg most of the time handlesreimar2009-02-181-0/+1
| | | | | | | | | | | | | | it correctly (VDPAU and probably H.264 currently don't, MPEG1/2 does etc.). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28643 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28641Uoti Urpala2009-02-1828-43/+58
|\| | | | | | | | | | | | | | | Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border macro) to use a wrapper macro in old-style VOs which do not provide a VO object argument. Before this function had an explicit global_vo argument in vo_gl/gl2. New vo_vdpau uses it too so use the same mechanism as most other functions.
| * Make it possible for mpcodecs_get_image to return NULL as thereimar2009-02-171-1/+1
| | | | | | | | | | | | | | documentation says it should instead of crashing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28638 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print an error and return NULL in vf_get_image if we try to allocatereimar2009-02-171-1/+6
| | | | | | | | | | | | | | | | a format with bpp == 0, since this can not work. This way at least we crash earlier and print an error message. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28637 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set avctx->opaque already at init instead of decode so it can be used inreimar2009-02-171-1/+1
| | | | | | | | | | | | | | | | get_format and get_buffer would not crash if called during avcodec_open. Patch by Gwenole Beauchesne [gbeauchesne splitted-desktop com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28636 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove stray empty lines.diego2009-02-171-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28630 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:diego2009-02-1727-27/+27
| | | | | | | | | | | | | | mem.c:32:5: warning: "HAVE_MALLOC_H" is not defined git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28629 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use FFmpeg instead of MPlayer MANGLE macro, they are equivalent in thisdiego2009-02-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | particular case. Avoids the warning: In file included from libmpcodecs/vf_fspp.c:693: ./mangle.h:34:1: warning: "MANGLE" redefined In file included from libmpcodecs/vf_fspp.c:46: ./libavutil/internal.h:113:1: warning: this is the location of the previous definition git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28624 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move FFmpeg #includes below all others so that they do not overridediego2009-02-171-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | system functions and cause the warning: In file included from libmpcodecs/vf_fspp.c:57: libmpcodecs/mp_image.h: In function 'new_mp_image': libmpcodecs/mp_image.h:214: warning: implicit declaration of function 'please_use_av_malloc' libmpcodecs/mp_image.h: In function 'free_mp_image': libmpcodecs/mp_image.h:226: warning: implicit declaration of function 'please_use_av_free' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28623 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix #endif comment.cehoyos2009-02-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28619 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for VDPAU video out, including hardware decoding.reimar2009-02-161-4/+16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28617 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28610Uoti Urpala2009-02-167-312/+225
|\|
| * The AV_XVMC_RENDER_MAGIC constant was renamed to AV_XVMC_ID in FFmpeg.diego2009-02-151-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28608 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reflect ffmpeg change of xvmc struct field to xvmc_id.iive2009-02-151-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28607 b3059339-0415-0410-9bf9-f77b7e298cf2
| * The xvmc_pixfmt_render structure was renamed to xvmc_pix_fmt in FFmpeg.diego2009-02-151-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28603 b3059339-0415-0410-9bf9-f77b7e298cf2
| * The xmvc structure member magic_id was renamed to unique_id.diego2009-02-151-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28601 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary #if around forward declaration.reimar2009-02-151-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28600 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Restructure get_format so it can easily be extended to handle VDPAUreimar2009-02-151-7/+14
| | | | | | | | | | | | | | and hardware-acceleration selected via get_format. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28599 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reuse the code for the general do_dr1 case to set get_buffer/release_buffer ↵reimar2009-02-151-3/+1
| | | | | | | | | | | | for XvMC. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28598 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use PIX_FMT_NONE instead of -1reimar2009-02-151-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28595 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove apparently unneeded CODEC_FLAG_EMU_EDGE for XvMCreimar2009-02-151-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28594 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Extend get_buffer to handle the XvMC case and remove mc_get_bufferreimar2009-02-151-93/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28591 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Unset MP_IMGFLAG_IN_USE in release_buffer.reimar2009-02-151-0/+2
| | | | | | | | | | | | | | | | This is only needed for MPI_IMGTYPE_NUMBERED support and will probably first be used for VDPAU, but it is still "the right thing to do". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28590 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge two checks for mpi != NULLreimar2009-02-151-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28589 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make the default release_buffer work for XvMC, use it and remove ↵reimar2009-02-151-33/+14
| | | | | | | | | | | | mc_release_buffer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28588 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of mc_render_slice and use the generic draw_slice instead.reimar2009-02-151-20/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28587 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reflect the change of xvmc struct name.iive2009-02-151-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28583 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move direct-rendering hack from vo_xvmc to vf_vo, so it does not need toreimar2009-02-151-1/+4
| | | | | | | | | | | | | | be duplicated for other systems like VDPAU or VAAPI. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28581 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Now xvmc struct uses magic_id fieldiive2009-02-151-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28578 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use fmt-conversion.h in vd_ffmpeg.creimar2009-02-141-27/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28562 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Consistently place whitespace around * ( ) and ,reimar2009-02-141-70/+70
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28560 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless breakreimar2009-02-141-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28559 b3059339-0415-0410-9bf9-f77b7e298cf2
| *