RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-22 06:42:03 +00:00
Code Issues Releases Wiki Activity
28,755 Commits 41 Branches 0 Tags 138 MiB
1e86963828
Commit Graph

32 Commits

Author SHA1 Message Date
Uoti Urpala
1e86963828 Merge svn changes up to r28537 2009-02-12 04:17:55 +02:00
diego
481d68007e Sync with latest FFmpeg changes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28479 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-07 15:40:07 +00:00
Uoti Urpala
c1b80dcbbb Merge svn changes up to r28204 2008-12-27 17:40:57 +02:00
diego
08de71edb1 Sync with latest FFmpeg changes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28178 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-22 09:20:38 +00:00
Uoti Urpala
2a6178e5ab Makefile, common.mak: Create .d files when creating corresponding .o 
The separate .d file creation logic has caused various problems, most
notably cases where 'make' exits without doing anybut but without
giving any error either. Change the Makefile so that .d files are
always created or updated when the corresponding .o file is. This
avoids the problems of current .d file generation and still gives
correct dependencies.

The common.mak change does the same for the libswscale build. However
it does not affect the directories under ffmpeg/ because those use
ffmpeg/common.mak. The MPlayer common.mak can be copied over the
ffmpeg/common.mak file to make the fix apply to the FFmpeg directories
too. This is not done automatically because the FFmpeg file is under
version control and changing it could cause problems.
 2008-12-06 05:33:33 +02:00
Uoti Urpala
1715c2a336 Merge svn changes up to r27949 
Conflicts:
	common.mak
	libvo/vo_xv.c
	libvo/x11_common.c
	libvo/x11_common.h
	stream/cache2.c
 2008-11-17 20:50:23 +02:00
diego
df978cfbcd Sync with latest FFmpeg changes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27902 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-08 09:51:12 +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
diego
0b1b4814a8 Sync with latest FFmpeg changes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26703 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-09 12:38:33 +00:00
Uoti Urpala
06a35804f3 Merge svn changes up to r26587 
Conflicts:

	Makefile
	configure
	osdep/timer-darwin.c
 2008-04-29 05:03:57 +03:00
Uoti Urpala
5c2583a0ee Make MPlayer build with a complete FFmpeg checkout in ffmpeg/ 
Instead of separate checkouts of the FFmpeg libavutil/, libavcodec/,
libavformat/, libpostproc/ subdirectories make MPlayer build with a
complete checkout of FFmpeg under ffmpeg/.

configure now creates config.mak and config.h at both the top level
and in ffmpeg/. The config.h files are identical. The config.mak for
FFmpeg has different include paths. The top-level common.mak and
subdir.mak are now used by libswscale only; the directories under
ffmpeg/ use the versions in ffmpeg/.
 2008-04-28 12:16:12 +03:00
diego
f3ffc8ca3a Sync with latest FFmpeg changes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26435 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-13 10:54:33 +00:00
diego
ae75174784 Merge simplifications from FFmpeg r12764. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26349 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-08 17:06:25 +00:00
diego
18f2d95890 Sync with FFmpeg's shiny new non-recursive build system. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26347 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-07 22:25:13 +00:00
diego
c9bd9a617a sync with FFmpeg r12599 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26278 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-26 09:58:37 +00:00
diego
9937bed877 sync with FFmpeg r12398 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26217 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-10 19:43:07 +00:00
diego
1abf699bae sync with FFmpeg r12354 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26187 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-07 00:22:09 +00:00
diego
4f01d9c698 sync with FFmpeg r10874 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24886 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-10-30 07:54:56 +00:00
diego
e2fe7f302e Sync with FFmpeg r10774. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24803 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-10-18 10:09:24 +00:00
diego
17722f1e6c Sync with FFmpeg r9278. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23544 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-10 22:20:24 +00:00
diego
f1829c7967 Sync with FFmpeg r7699. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22010 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-01-25 00:35:53 +00:00
diego
f7c520b74d Sync with FFmpeg r7634. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21993 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-01-21 23:28:05 +00:00
diego
d55ba3f046 Sync with FFmpeg r7167. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21226 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-25 16:55:02 +00:00
diego
cf9cd5fee2 Sync with FFmpeg r6700. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20233 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-15 13:16:18 +00:00
diego
33db247ee5 Sync with FFmpeg r6642. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20158 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-11 14:12:17 +00:00
diego
27f91d06d9 Sync with FFmpeg r6563. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20074 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-05 17:12:48 +00:00
diego
313d4f22cb Sync with FFmpeg r6543. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20022 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-03 18:28:37 +00:00
diego
a17fe78087 sync with FFmpeg r5930 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19381 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-08-13 08:27:39 +00:00
diego
9d466c4326 sync with FFmpeg r5718 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19021 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-11 22:44:05 +00:00
diego
9706c6b616 Sync with upstream. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18312 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-27 12:00:56 +00:00
aurel
6889ea11a1 update config.mak to match ffmpeg's version (fix alpha compilation) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17701 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-27 22:44:22 +00:00
rtognimp
c104d2bd5f Import common.mak v1.1 from ffmpeg cvs, now it's needed by the building 
system


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17628 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-14 21:42:49 +00:00