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
Uoti Urpala
738f66b1bc
Merge svn changes up to r28549
2009-02-13 03:52:51 +02: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
Uoti Urpala
1e86963828
Merge svn changes up to r28537
2009-02-12 04:17:55 +02: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
Uoti Urpala
9790f4e6e7
Merge svn changes up to r28461
2009-02-04 00:28:17 +02: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
Uoti Urpala
9bcd12fdf5
Merge svn changes up to r28310
...
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
2009-01-15 05:57:31 +02: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
Uoti Urpala
71b25cca76
Merge svn changes up to r28162
2008-12-19 00:29:24 +02: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
Uoti Urpala
259ea9d703
Merge svn changes up to r27573
...
Conflicts:
libmpcodecs/vd_ffmpeg.c
2008-09-10 23:59:08 +03: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
Uoti Urpala
b56858342f
Merge svn changes up to r27514
2008-09-03 10:16:30 +03: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
Uoti Urpala
f6dfaf26f8
Make various functions static
2008-08-12 14:57:12 +03:00
Uoti Urpala
04f3909a72
Merge svn changes up to r27374
...
Conflicts:
cfg-common-opts.h
cfg-mplayer.h
command.c
configure
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpcodecs/vf_vo.c
libmpdemux/demuxer.h
libmpdemux/stheader.h
mp_core.h
mplayer.c
stream/stream_radio.c
2008-07-30 16:39:24 +03: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
Uoti Urpala
d5c868325c
Merge svn changes up to r26979
...
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
2008-06-04 08:10:48 +03: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
Uoti Urpala
a41db36b22
Merge svn changes up to r26783
...
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
2008-05-15 21:19:35 +03: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
Uoti Urpala
31db39d8ec
Make video decoder description structs const
...
This makes the per-decoder struct vd_functions and its ->info
struct constants. Same for the mpcodecs_vd_drivers[] table of
pointers to those structs.
2008-04-25 07:16:32 +03:00
Uoti Urpala
7dc4226348
Move vd_use_slices to options struct
2008-04-25 07:15:07 +03:00
Uoti Urpala
3fa6f2d3e1
Move -lavdopts to options struct
2008-04-25 03:31:57 +03:00
Uoti Urpala
15b34d1fd8
vd_ffmpeg.c: Eliminate some compiler warnings
...
Make the functions used in avctx->draw_horiz_band match its type (add
a "const"). Add cast to avoid void * arithmetic.
2008-04-25 03:29:27 +03: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