1
mirror of https://github.com/mpv-player/mpv synced 2024-10-30 04:46:41 +01:00
Commit Graph

238 Commits

Author SHA1 Message Date
diego
0c4e65f15a The xmvc structure member magic_id was renamed to unique_id.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28601 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:35:24 +00:00
reimar
b2c338819e Remove unnecessary #if around forward declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28600 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:29:00 +00:00
reimar
de96ea2e01 Restructure get_format so it can easily be extended to handle VDPAU
and hardware-acceleration selected via get_format.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28599 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:23:05 +00:00
reimar
14b1991a42 Reuse the code for the general do_dr1 case to set get_buffer/release_buffer for XvMC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28598 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 16:57:08 +00:00
reimar
c6ae3112f2 Use PIX_FMT_NONE instead of -1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28595 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 15:27:12 +00:00
reimar
2a57385958 Remove apparently unneeded CODEC_FLAG_EMU_EDGE for XvMC
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28594 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 15:24:32 +00:00
reimar
c618bdde05 Extend get_buffer to handle the XvMC case and remove mc_get_buffer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28591 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 14:10:47 +00:00
reimar
5d21955bb1 Unset MP_IMGFLAG_IN_USE in release_buffer.
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
2009-02-15 13:24:17 +00:00
reimar
9275737b40 Merge two checks for mpi != NULL
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28589 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 13:17:04 +00:00
reimar
eee0fbd3af Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28588 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 13:14:17 +00:00
reimar
d1e711b21b Get rid of mc_render_slice and use the generic draw_slice instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28587 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 13:04:57 +00:00
iive
c97692ac9d Reflect the change of xvmc struct name.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28583 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 08:46:18 +00:00
iive
d999d7652d Now xvmc struct uses magic_id field
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28578 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 02:38:20 +00:00
reimar
e41470a32e Use fmt-conversion.h in vd_ffmpeg.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28562 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:58:33 +00:00
reimar
c4854a0ead Consistently place whitespace around * ( ) and ,
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28560 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:43:06 +00:00
reimar
f2eb312f74 Remove useless break
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28559 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:30:41 +00:00
reimar
c81dd09974 Indentation and other whitespace fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28558 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:29:59 +00:00
diego
1538fddada Remove local copy of xvmc_render.h, it is now an installed header in FFmpeg.
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
2009-02-14 17:18:55 +00:00
reimar
8c2821f32d 100l, removed a #ifdef the wrong way, CODEC_FLAG_NOT_TRUNCATED no longer exists,
so remove reference to it to fix compilation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28545 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-12 16:58:47 +00:00
reimar
403de5ac6e Remove trailing whitespace from vd_ffmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28544 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-12 15:41:59 +00:00
reimar
9fc1c19f7a Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28543 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-12 15:39:32 +00:00
reimar
706f148b78 Remove several #ifdefs that check for libavcodec features from vd_ffmpeg.
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
2009-02-12 15:35:18 +00:00
aurel
de03d58545 change internal real video packetizing format to the more straight forward one
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
2009-02-09 22:00:57 +00:00
zuxy
edc3c57aee Convert CONFIG_XVMC into a 0/1 definition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28447 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-02 07:26:05 +00:00
gpoirier
0f224d32dc revert #ifdef WORDS_BIGENDIAN => #if WORDS_BIGENDIAN changes from r28331
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28334 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 13:19:29 +00:00
gpoirier
5538dcf03b fix compilation on non x86 machines (PPC here)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28331 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 10:07:14 +00:00
diego
339746a776 Sync with latest round of xvmc changes in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28237 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-02 17:06:09 +00:00
diego
93574faeee xvmc is now a CONFIG_ option in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28154 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-15 22:25:39 +00:00
gpoirier
2bfa730214 fix compilation with lavc version > r15270
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27549 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-08 20:01:10 +00:00
uau
923f67082e Fix compilation after libavcodec major version 52 changes
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
2008-09-08 17:02:32 +00:00
diego
d5f550e257 Remove outdated URL from vd_info_t struct.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27533 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-06 18:16:39 +00:00
aurel
a5f69284d9 handle the lavfpref demuxer in the same way as the lavf one
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27489 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-27 11:31:53 +00:00
diego
4b141479da Start unifying names of internal preprocessor directives.
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
2008-07-30 12:01:30 +00:00
diego
c1f5c9bd3f cosmetics: Remove pointless parentheses from return calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 00:23:02 +00:00
michael
16aa40b6f8 Reformat very ugly code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26726 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 19:15:57 +00:00
michael
5d0b576f70 AVOptions support for libavcodec based video decoders.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26724 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 18:55:31 +00:00
diego
06cbb5007c Restore grayscale decoding support with FFmpeg.
Removing support was done due to a silly misunderstanding.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26427 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 00:03:11 +00:00
diego
ca1fb12840 Grayscale encoding/decoding with FFmpeg is no longer enabled, remove references
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
2008-03-07 21:30:01 +00:00
diego
21c200e767 FFmpeg now uses different (unified) #include paths.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-25 15:46:36 +00:00
diego
835c654bb0 typo fix: inited --> initialized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:23:55 +00:00
reimar
b8a403f124 Make m_option_t arrays referenced by cfg-common.h const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25269 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 21:26:23 +00:00
rtogni
ec70a0fbbd Change the frame format passed to lavc realvideo decoders to adapt for
the changes in r10825.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24882 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-28 22:32:20 +00:00
rtogni
6d5e4cc2ca Disable direct rendering for ROQ video, the buffer management used by
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
2007-09-30 20:02:57 +00:00
reimar
ca7b84e869 Make vd_ffmpeg work with lavf demuxer also for RealVideo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24543 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-16 11:52:05 +00:00
diego
90aa63e2fd Remove pointless #ifdef HAVE_XVMC within get_format(), all of the function
is protected by that #ifdef.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24274 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 17:38:08 +00:00
diego
89855e1022 warning fix:
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
2007-08-28 17:36:04 +00:00
diego
a2c5abc3d2 cosmetics: Add some explanatory comments to #endif directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24268 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 17:02:19 +00:00
diego
4ea8b17121 Fix some unused variable warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24162 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 09:46:47 +00:00
diego
5edd9af248 Remove some unused variables, patch by timwoj ieee org.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-28 08:42:35 +00:00
gpoirier
306f6243fd Fix ratio aspect on Matroska files, broken with recent 'spect change in DVB' 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
2007-03-07 09:19:36 +00:00