Commit Graph

28804 Commits

Author SHA1 Message Date
reimar 4f9a9ae44f Make it possible for mpcodecs_get_image to return NULL as the
documentation says it should instead of crashing.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28638 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 19:01:29 +00:00
reimar bdfef5ff39 Print an error and return NULL in vf_get_image if we try to allocate
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
2009-02-17 18:59:47 +00:00
reimar 8e5edec13e Set avctx->opaque already at init instead of decode so it can be used in
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
2009-02-17 16:40:50 +00:00
Gabrov 78d1037cd9 Typo fix
Patch submitted directly to me by Rezso Pader (rezso at rezso dot net)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28635 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 15:00:57 +00:00
diego ec3cc468ca cosmetics: Replace unused 'argc/argv' in main declarations by 'void'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28634 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 12:00:43 +00:00
reimar 01ef7e4579 Extend calc_src_dst_rects to also calculate the border values needed for
correctly placed dvdnav highlights, and fix direct3d and vdpau accordingly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28633 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 11:59:49 +00:00
diego a845504a5e cosmetics: const static --> static const, avoids the debug mode warning:
cpuinfo.c:80: warning: 'static' is not at beginning of declaration


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28632 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 11:52:39 +00:00
diego e9d5b64a29 Also set HAVE_EBP_AVAILABLE in debug mode.
patch by Gwenole Beauchesne, gbeauchesne splitted-desktop com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28631 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 11:40:59 +00:00
diego 687655ff2f cosmetics: Remove stray empty lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28630 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 11:29:43 +00:00
diego be8c67909b Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:
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
2009-02-17 11:16:19 +00:00
diego e98a6e2bff Convert HAVE_MEMALIGN into a 0/1 definition, fixes the warning:
mem.c:67:7: warning: "HAVE_MEMALIGN" is not defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28628 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 10:41:13 +00:00
cehoyos 4a8a46fafd Fix compilation after last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28627 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 10:13:08 +00:00
reimar a3dbab1813 Cropping parameter to calc_src_dst_rects is const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28626 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 08:09:36 +00:00
reimar 4ed961f7e5 100l, reset ass_border when switching out of fullscreen mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28625 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 08:05:14 +00:00
diego b14c70b8f5 Use FFmpeg instead of MPlayer MANGLE macro, they are equivalent in this
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
2009-02-17 03:20:40 +00:00
diego 53067187b8 Move FFmpeg #includes below all others so that they do not override
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
2009-02-17 03:15:10 +00:00
diego bc2834c384 Move libavutil #includes below all others so that they do not override
system functions and cause the warning:
In file included from mp3lib/sr1.c:27:
/mp_msg.h:115: warning: 'please_use_av_log_instead_of_printf' is an unrecognized format function type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28622 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 03:08:56 +00:00
diego de53a241ed The CONFIG_TV_TELETEXT preprocessor directive is defined/undefined,
so use it with #ifdef instead of #if; fixes the warning:
libvo/sub.c:1233:5: warning: "CONFIG_TV_TELETEXT" is not defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28621 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 02:57:10 +00:00
uau 991d64b31f Fix compilation without VDPAU
The commit adding vo_vdpau had two bugs that broke compilation when
VDPAU was not enabled.
- video_out.c used "#ifdef CONFIG_VDPAU", but it's always set to 0 or 1
- In configure, MPEG1_VDPAU_DECODER was dropped from the list of
  libavcodec codecs to disable when moving VDPAU-related ones from the
  always-disabled list to a conditinal one.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28620 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 00:09:15 +00:00
cehoyos 288f25d8d9 Fix #endif comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28619 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 23:56:19 +00:00
cehoyos dea247e8b1 Add note about ffwmv3vdpau.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28618 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 23:05:18 +00:00
reimar 7e9fd9351c Add support for VDPAU video out, including hardware decoding.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28617 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 20:58:13 +00:00
bircoph 47b6eb3758 Synced with r28615.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28616 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 20:07:52 +00:00
bircoph 113055c9cf Add ccache usage suggestion to speed up compilation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28615 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 20:03:32 +00:00
reimar 8e90297698 100l, do 0-filling on resume (to avoid desync after pause) in ao_oss only when
the we output a PCM format, not for e.g. AC3.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28614 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 18:38:54 +00:00
diego e3847132b5 Use fixed-point implementation on avr32.
patch by Hans-Christian Egtvedt, hans-christian.egtvedt atmel com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28613 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 17:05:58 +00:00
diego 3983328889 Make configure recognize avr32.
patch by Hans-Christian Egtvedt, hans-christian.egtvedt atmel com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28612 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 17:02:16 +00:00
diego 1b915e419e Replace double semicolon by single semicolon.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 02:00:29 +00:00
diego eacf4421f4 Sync renaming of xvmc struct members in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28610 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 00:29:25 +00:00
Gabrov ed6cb5732f synced with r28593
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28609 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 00:15:44 +00:00
diego a452d22384 The AV_XVMC_RENDER_MAGIC constant was renamed to AV_XVMC_ID in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28608 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 22:02:24 +00:00
iive 33f7ff9403 Reflect ffmpeg change of xvmc struct field to xvmc_id.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28607 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 20:29:29 +00:00
bircoph 1e8e195442 Fix spelling: "whom" should be used instead of "which" when we're
talking about people. Mistake noticed by Paul Arthur
flowerysong00 yahoo com.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28606 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 20:27:59 +00:00
bircoph 06e12b4545 Remove the reference to history.html because history.xml was purged
from xml documentation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28605 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 18:21:56 +00:00
diego e3638bae19 whitespace cosmetics: Remove all tabs and trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28604 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:55:57 +00:00
diego d274cbbbb5 The xvmc_pixfmt_render structure was renamed to xvmc_pix_fmt in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28603 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:49:42 +00:00
diego 3a058c8c6a Remove unnecessary #ifdef around internal #include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28602 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:38:47 +00:00
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
bircoph 08898f0908 Change man page encoding from KOI8-R to UTF-8.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28597 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 15:42:58 +00:00
bircoph 75c960f9b0 I hope this one is clearer and understandable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28596 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 15:31:25 +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
bircoph 496b348cad Remove trailing whitespaces.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28593 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 14:48:30 +00:00
bircoph 9c4a64857b Synced with r28201.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28592 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 14:46: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