summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vd_ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r29412Uoti Urpala2009-07-071-2/+7
|\
| * Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctlyreimar2009-06-011-2/+7
| | | | | | | | | | | | | | again instead of in CorePNG delta mode. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29340 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-11/+11
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-11/+11
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | vd_ffmpeg.c: Use FFmpeg-mt compatible code for codec delayUoti Urpala2009-04-301-2/+8
| | | | | | | | | | | | | | | | This code to calculate codec delay should work with both with regular FFmpeg and FFmeg-mt. This MPlayer version is not completely compatible with current FFmpeg-mt though, since it has a build system change which matches upstream FFmpeg but hasn't been integrated in FFmpeg-mt yet (RUNTIME_CPUDETECT -> CONFIG_RUNTIME_CPUDETECT rename).
* | Merge svn changes up to r29117Uoti Urpala2009-04-011-2/+2
|\|
| * Use MP_MAX_PLANES as size of arrays passed to mpcodecs_draw_slice.reimar2009-03-291-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29098 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow to use vdpau temporal deinterlacers with hardware accelerated decoding.cehoyos2009-03-181-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28991 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28862Uoti Urpala2009-03-071-19/+27
|\|
| * 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 r28690Uoti Urpala2009-02-211-2/+2
|\|
| * 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-191-0/+1
|\|
| * 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-181-8/+18
|\| | | | | | | | | | | | | | | 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.
| * 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
| * 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-161-297/+174
|\|
| * 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
| * 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
| * Indentation and other whitespace fixesreimar2009-02-141-90/+90
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28558 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove local copy of xvmc_render.h, it is now an installed header in FFmpeg.diego2009-02-141-5/+5
| | | | | | | | | | | | | | Also adapt MPlayer to definition name changes in libavcodec/xvmc.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28557 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28549Uoti Urpala2009-02-131-208/+193
|\|
| * 100l, removed a #ifdef the wrong way, CODEC_FLAG_NOT_TRUNCATED no longer exists,reimar2009-02-121-1/+0
| | | | | | | | | | | | | | so remove reference to it to fix compilation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28545 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove trailing whitespace from vd_ffmpeg.reimar2009-02-121-34/+34
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28544 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.reimar2009-02-121-179/+179
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28543 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove several #ifdefs that check for libavcodec features from vd_ffmpeg.reimar2009-02-121-14/+0
| | | | | | | | | | | | They make no sense since only recent libavcodec versions are supported anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28542 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28537Uoti Urpala2009-02-121-22/+0
|\|
| * change internal real video packetizing format to the more straight forward oneaurel2009-02-091-22/+0
| | | | | | | | | | | | | | | | see [MPlayer-dev-eng] [PATCH] cleanup/uniformize real video packetizing patch blessed by Roberto git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28503 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28461Uoti Urpala2009-02-041-6/+6
|\|
| * Convert CONFIG_XVMC into a 0/1 definition.zuxy2009-02-021-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28447 b3059339-0415-0410-9bf9-f77b7e298cf2
| * revert #ifdef WORDS_BIGENDIAN => #if WORDS_BIGENDIAN changes from r28331gpoirier2009-01-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28334 b3059339-0415-0410-9bf9-f77b7e298cf2
| * fix compilation on non x86 machines (PPC here)gpoirier2009-01-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28331 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28310Uoti Urpala2009-01-151-4/+4
|\| | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * Sync with latest round of xvmc changes in FFmpeg.diego2009-01-021-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28237 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28162Uoti Urpala2008-12-191-8/+8
|\|
| * xvmc is now a CONFIG_ option in FFmpeg.diego2008-12-151-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28154 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27573Uoti Urpala2008-09-101-3/+3
|\| | | | | | | | | Conflicts: libmpcodecs/vd_ffmpeg.c
| * fix compilation with lavc version > r15270gpoirier2008-09-081-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27549 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation after libavcodec major version 52 changesuau2008-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | Some symbols were dropped or renamed, requiring corresponding changes in MPlayer. - Use AVCodecContext->bits_per_coded_sample instead of ->bits_per_sample. - Use AVCodecContext->trellis instead of ->flags&CODEC_FLAG_TRELLIS_QUANT. - Don't set AVCodecContext->rtp_mode (already marked unused before). - Use ff_eval2() instead of ff_eval(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27548 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove outdated URL from vd_info_t struct.diego2008-09-061-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27533 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27514Uoti Urpala2008-09-031-1/+2
|\|
| * handle the lavfpref demuxer in the same way as the lavf oneaurel2008-08-271-1/+2
| | |