summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vd_ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
* 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
* 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
* 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
* 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
* 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
* 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
* 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
* 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
* 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
* 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
* handle the lavfpref demuxer in the same way as the lavf oneaurel2008-08-271-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27489 b3059339-0415-0410-9bf9-f77b7e298cf2
* Start unifying names of internal preprocessor directives.diego2008-07-301-1/+1
| | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Remove pointless parentheses from return calls.diego2008-05-161-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reformat very ugly code.michael2008-05-101-15/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26726 b3059339-0415-0410-9bf9-f77b7e298cf2
* AVOptions support for libavcodec based video decoders.michael2008-05-101-0/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26724 b3059339-0415-0410-9bf9-f77b7e298cf2
* Restore grayscale decoding support with FFmpeg.diego2008-04-131-0/+3
| | | | | | | Removing support was done due to a silly misunderstanding. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26427 b3059339-0415-0410-9bf9-f77b7e298cf2
* Grayscale encoding/decoding with FFmpeg is no longer enabled, remove referencesdiego2008-03-071-3/+0
| | | | | | | from the documentation and the relevant options from the glue code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26198 b3059339-0415-0410-9bf9-f77b7e298cf2
* FFmpeg now uses different (unified) #include paths.diego2008-02-251-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
* typo fix: inited --> initializeddiego2008-02-141-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make m_option_t arrays referenced by cfg-common.h constreimar2007-12-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25269 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change the frame format passed to lavc realvideo decoders to adapt for rtogni2007-10-281-15/+12
| | | | | | | | the changes in r10825. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24882 b3059339-0415-0410-9bf9-f77b7e298cf2
* Disable direct rendering for ROQ video, the buffer management used by rtogni2007-09-301-1/+1
| | | | | | | the codec is not compatible with MPlayer idea of reget_buffer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24676 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make vd_ffmpeg work with lavf demuxer also for RealVideo.reimar2007-09-161-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24543 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove pointless #ifdef HAVE_XVMC within get_format(), all of the functiondiego2007-08-281-2/+0
| | | | | | | is protected by that #ifdef. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24274 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fix:diego2007-08-281-3/+3
| | | | | | | | vd_ffmpeg.c: At top level: vd_ffmpeg.c:915: warning: 'get_format' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24273 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Add some explanatory comments to #endif directives.diego2007-08-281-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24268 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix some unused variable warnings.diego2007-08-251-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24162 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some unused variables, patch by timwoj ieee org.diego2007-05-281-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix ratio aspect on Matroska files, broken with recent 'spect change in DVB' ↵gpoirier2007-03-071-1/+4
| | | | | | | | | | | | | | patch patch by Carl Eugen Hoyos % cehoyos A ag P or P at % Original thread: Subj: [MPlayer-dev-eng] [PATCH] Fix aspect in mkv Date: 03/05/2007 02:01 PM Bug report report: http://lists.mplayerhq.hu/pipermail/mplayer-users/2007-March/065823.html git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22484 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Fix some common typos, appropiate --> appropRiate,diego2007-02-241-1/+1
| | | | | | | handEling --> handling, dependAnt --> dependEnt. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22334 b3059339-0415-0410-9bf9-f77b7e298cf2
* reinit the vo when aspect ratio changes; patch by C.E. Hoyos approved by Michaelnicodvb2007-02-201-7/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22295 b3059339-0415-0410-9bf9-f77b7e298cf2
* mplayer canot handle DR1 with CODEC_ID_INTERPLAY_VIDEO (later needs too many ↵michael2007-02-171-1/+1
| | | | | | buffers it seems) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22240 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert part of commit r22170.iive2007-02-071-2/+2
| | | | | | | | | FFmpeg lavcodecs version is still (or according to ffmpeg commit r7868, it's back to) 49.3.0, so global variables are not yet directly accessable (if ever). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22171 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation after deprecation of some lav log level andreimar2007-02-071-4/+4
| | | | | | | pixel format stuff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22170 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing checks in RealVideo slice handling code.reimar2007-02-061-3/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22165 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmeticsreimar2007-02-031-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22110 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid crash in uninit if codec not foundreimar2007-02-031-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22109 b3059339-0415-0410-9bf9-f77b7e298cf2
* Swap palette on bigendian.reimar2007-01-311-0/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22094 b3059339-0415-0410-9bf9-f77b7e298cf2
* BE_32 -> AV_RB32reimar2007-01-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21964 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of min/max macros from aviheader.h, they do not belong here.reimar2006-12-091-2/+2
| | | | | | | Replace their uses by FFMIN/FFMAX git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
* Hack around libavutil/bswap.h compilation problems due to always_inline ↵reimar2006-12-071-1/+1