RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-26 17:12:36 +00:00
Code Issues Releases Wiki Activity
28,609 Commits 41 Branches 86 Tags 142 MiB
0248741426
Commit Graph

2173 Commits

Author SHA1 Message Date
reimar
0248741426 Handle mpcodecs_get_image returning NULL, FFmpeg most of the time handles 
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
 2009-02-18 07:52:17 +00:00
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
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
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
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
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
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
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
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
reimar
078091e5de Move direct-rendering hack from vo_xvmc to vf_vo, so it does not need to 
be duplicated for other systems like VDPAU or VAAPI.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28581 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 08:07:36 +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
diego
1147a78695 Replace fprintf call by mp_msg, fixes the warning: 
In file included from libmpcodecs/vf_fspp.c:58:
libmpcodecs/mp_image.h: In function 'mp_image_setfmt':
libmpcodecs/mp_image.h:207: warning: implicit declaration of function 'please_use_av_log_instead_of_fprintf'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28553 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-14 11:43:14 +00:00
reimar
5da2252a2c Cosmetics: handle all special/compressed formats in a single if in mp_image_setfmt 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28552 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-14 08:37:29 +00:00
reimar
8c1978cc26 Add support for image formats and codecs used by VDPAU 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28551 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-14 08:29:45 +00:00
reimar
f78c49e030 Add MP_IMGTYPE_NUMBERED which gives access to the kind of mp_image_t that 
are numbered and have a "in use" flag which is necessary for proper
buffer management as e.g. H.264 direct-rendering needs and is already used
successfully for the -vo vdpau work-in-progress.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28550 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-14 08:22:49 +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
diego
95c44000d7 Give _XOPEN_SOURCE #define an explicit 600 value. Fixes build on Open Solaris. 
patch by Imran Syed, freakabcd gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28480 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-07 17:34:45 +00:00
reimar
3819692fda swab() needs _XOPEN_SOURCE to be defined. 
Fixes two implicit declaration warnings.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28455 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-03 10:39:56 +00:00
reimar
a019ba3643 Rename lzo1x_decode -> av_lzo1x_decode, this was missed in the previous patch. 
It currently works (though badly with missing prototype) but will break on
libavutil version bump.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28450 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-03 00:12:19 +00:00
diego
046cf63aff FFmpeg sync: LZO_OUTPUT_PADDING --> AV_LZO_OUTPUT_PADDING 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28449 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-02 23:48:16 +00:00
reimar
75243478ce Adapt to lzo changes in libavutil 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28448 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-02 20:22:36 +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
diego
56d9a23ee9 Add support for libavcodec GMC flag, patch by Dave Baker, dbkr mxtelecom com. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28415 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 02:10:31 +00:00
diego
9fdb04a3d8 Update libavcodec 'aic' flag define to match current FFmpeg. 
patch by Dave Baker, dbkr mxtelecom com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28395 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-30 23:08:36 +00:00
reimar
9c116d24e6 Avoid a division by 0 when using -oac mp3lame but no audio data actually is encoded. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28382 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-28 12:46:05 +00:00