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

222 Commits

Author SHA1 Message Date
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
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
diego
4f452096c0 cosmetics: Fix some common typos, appropiate --> appropRiate,
handEling --> handling, dependAnt --> dependEnt.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22334 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-24 10:27:14 +00:00
nicodvb
e32cbbf7dc reinit the vo when aspect ratio changes; patch by C.E. Hoyos approved by Michael
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22295 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-20 20:09:29 +00:00
michael
ebe6884d2a mplayer canot handle DR1 with CODEC_ID_INTERPLAY_VIDEO (later needs too many buffers it seems)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22240 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-17 03:02:38 +00:00
iive
cb3c29effe Revert part of commit r22170.
FFmpeg lavcodecs version is still 
(or according to ffmpeg commit r7868, it's back to)
49.3.0, so global variables are not yet directly accessable (if ever).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22171 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-07 12:31:37 +00:00
reimar
8ff440d6a4 Fix compilation after deprecation of some lav log level and
pixel format stuff.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22170 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-07 09:58:23 +00:00
reimar
c8e55fd4bc Add missing checks in RealVideo slice handling code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22165 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-06 18:30:56 +00:00
reimar
d157c5e4d2 Cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22110 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-03 13:20:31 +00:00
reimar
5f37d3fbc6 Avoid crash in uninit if codec not found
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22109 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-03 13:19:21 +00:00
reimar
2b9be36ccc Swap palette on bigendian.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22094 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-31 18:14:47 +00:00
reimar
db6e74fe44 BE_32 -> AV_RB32
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21964 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-19 23:15:53 +00:00
reimar
6caf5586ee Get rid of min/max macros from aviheader.h, they do not belong here.
Replace their uses by FFMIN/FFMAX


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 12:24:11 +00:00
reimar
18004d2d98 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 11:58:07 +00:00
reimar
10021f03bc Fix memleak if vd_ffmpeg init fails
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21514 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-06 10:41:34 +00:00
reimar
6d0d8d71f8 Compile fix, BE_32 definition has been moved
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21473 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 17:46:37 +00:00
diego
cac6c0eea2 Remove bswap.h, use libavutil/bswap.h instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:02:45 +00:00
reimar
690fb7a8e1 Fix incorrect use of be2me_32 on a pointer, use BE_32 instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21267 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:26:21 +00:00