1
0
mirror of https://github.com/mpv-player/mpv synced 2025-04-25 21:01:48 +00:00
Commit Graph

2240 Commits

Author SHA1 Message Date
reimar
77195cf5c4 nuv encoder 64 bit fix: avoid using long/sizeof(long)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28909 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 13:37:55 +00:00
reimar
276a73e2f2 Remove internal NuppelVideo decoder, the code in libavcodec can decode
those files and some more and is far more maintainable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28888 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 13:32:42 +00:00
reimar
624d8ff171 Get rid of pointless debugging code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28887 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 13:21:00 +00:00
reimar
7903f65ee8 Remove the grayscale and 4:2:2 RTjpeg code, it is neither used nor is there
anything special about to to justify preserving it for documentation purposes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28886 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 13:17:18 +00:00
reimar
735c81a0f5 Remove colourspace-conversion stuff from rtjpeg, we have functions to do that
better and it doesn't belong in that file anyway.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28885 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 13:10:21 +00:00
reimar
6d367acbdd Mark everything not used outside the file as "static"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28884 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 13:08:22 +00:00
reimar
04702afb84 Remove functions not used by MPlayer from header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28883 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 13:02:44 +00:00
reimar
8afafb8c2e Remove useless "extern" in function declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28882 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 12:57:53 +00:00
reimar
6cf4aafa36 Add some "const" to mpcodecs_vd_drivers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28861 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-06 20:20:12 +00:00
reimar
3be5ebde87 Swap order of VFCTRL_DRAW_EOSD and VFCTRL_DRAW_OSD so that the EOSD is drawn
below the OSD and document possible issues when this is changed.
Patch by Uoti (though originally intended for a different issue) with extra comment by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28841 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-06 10:45:49 +00:00
reimar
0f43db1769 Add another hack to work-around the currently completely inconsistent way in
which libavcodec sets AVCodecContext::pix_fmt.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28801 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-03 13:38:33 +00:00
reimar
aacd081579 10l, replace a tab that slipped in.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28767 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-01 09:09:49 +00:00
reimar
1002389056 Create a set_format_params function that sets all the special options needed
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
2009-03-01 09:03:01 +00:00
diego
35fc0ebf3f Set time_base to 1/samplerate, like FFmpeg does, instead of leaving it at the
default 0/1. This is not required by a lot of codecs, but at least by libvorbis.
patch by Nicolas George, nicolas.george normalesup org


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28695 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-21 21:03:57 +00:00
diego
b92e910e7a Remove unused and unreachable code hunk that was surrounded by a misspelled
preprocessor condition.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28663 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-19 10:06:43 +00:00
iive
c73f0e18bd Return PIX_FMT_NONE if the video system refuses all other formats.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28662 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-19 09:21:46 +00:00
reimar
60fa5a134d Add VOCAP_NOSLICES and use it to allow vo_vdpau to not support slices for
YV12 - since VDPAU only has functions to upload the full frame at once
there is no sense in supporting draw_slice for that.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28646 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-18 12:30:15 +00:00
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
diego
eb4a4604c0 HAVE_3DNOW --> HAVE_AMD3DNOW
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28370 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-26 09:29:53 +00:00
diego
4a0bcc1319 Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28364 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-25 22:34:26 +00:00
diego
4ac4b493a9 Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28362 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-25 21:59:08 +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
707afbe9d6 Completely get rid of MMX define, use HAVE_MMX define instead.
Patch by Guillaume LECERF % foxcore A gmail P com %


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28333 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 12:37:56 +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
reimar
3983898734 Another missed #ifdef HAVE_MMX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28328 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 09:35:05 +00:00
reimar
97df2f9162 More #ifdef HAVE_MMX etc. missed by earlier search.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28327 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 09:32:54 +00:00
reimar
93d598c7b2 Lots and lots of #ifdef ARCH_... -> #if ARCH_...
and #ifdef HAVE_MMX etc -> #if HAVE_MMX.
There might be still more that need to be fixed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28325 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 09:21:21 +00:00
diego
af6e5d6978 Fix two more instances of nonstandard license headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28262 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 11:06:28 +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
99fd037bd7 Avoid unused variable warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28233 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-02 12:53:05 +00:00
diego
4e13ef3aca Reorder #includes and #ifdefs to avoid excessive #ifdeffery.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28232 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-02 12:48:11 +00:00
diego
c6c7538c54 Reorder #includes and #ifdefs to avoid warnings and excessive #ifdeffery.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28231 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-02 12:28:47 +00:00
reimar
5fcb179834 XVID profile array should be const, so it is in rodata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28221 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-01 11:16:52 +00:00
reimar
17ea23ac74 Fix OSD flickering with filters that add frames (tfields, yadif) and
-correct-pts

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28211 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-30 10:40:26 +00:00
reimar
8385fa3dc6 Fix OSD flicker with tfields as well.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28210 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-30 10:38:39 +00:00
reimar
5904de25e3 Avoid flickering OSD with -vf yadif=1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28209 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-30 10:38:29 +00:00
reimar
1b14e4f420 Fix imaadpcm extradata with lavc encoder.
The formula to calculate frame size was wrong, duplicated code from the encoder
and did not take endianness into account when writing the value into extradata.
Patch by Edouard Gomez [ed gomez (at) free fr].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28167 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-20 10:18:15 +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
diego
474d1dc364 Replace informal GPL notices by standard GPL headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28145 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-13 12:33:22 +00:00
diego
9fafed66bc license header consistency cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28144 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-13 12:31:07 +00:00
diego
39090878e5 Replace informal GPL notes by standard GPL header.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28140 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-13 12:13:48 +00:00
diego
0864f92e7a Get rid of pointless 'extern' keywords.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
diego
5351098826 Create a separate codecs.conf entry for Tremor and use it if MPlayer is
with Tremor support instead of libvorbis. Previously MPlayer would show
the same output on the console when decoding with libvorbis and Tremor.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28014 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 08:31:44 +00:00
diego
929dc9a8ac cosmetics: Move up uninit() to avoid a forward declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27983 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 12:01:48 +00:00
diego
0ad147ed5c cosmetics: consistent function declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27982 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 11:59:37 +00:00
diego
9e2505a3f5 cosmetics: Remove tabs and trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27981 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 11:58:11 +00:00
reimar
7a3fc5ad5a Use libavutil FFMIN etc. instead of defining our own variants.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27878 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-02 15:51:00 +00:00
reimar
9f7bae92df Avoid pointless casting of void*
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27877 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-02 11:52:49 +00:00
diego
91c3f024a9 Fix smartblur filter crash due to missing default scaler choice;
set bicubic as the default scaler.
patch by Kurt Garloff, kurt garloff de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27838 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-27 21:00:12 +00:00
uau
1a089681fc vf_palette: Fix compilation after libswscale API changes
Patch from Guillaume Poirier. I didn't test the functionality of the
filter but at least it fixes compilation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27822 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-25 00:07:59 +00:00
diego
4722fa0b82 IWMMXT optimizations were removed from our internal libmpeg2 copy, so now
remove it from the library interface code as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27812 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-22 23:39:39 +00:00