aboutsummaryrefslogtreecommitdiffhomepage
path: root/common.mak
Commit message (Collapse)AuthorAge
* Merge svn changes up to r26783Gravatar Uoti Urpala2008-05-15
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
| * Sync with latest FFmpeg changes.Gravatar diego2008-05-09
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26703 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26587Gravatar Uoti Urpala2008-04-29
|\| | | | | | | | | | | | | | | Conflicts: Makefile configure osdep/timer-darwin.c
* | Make MPlayer build with a complete FFmpeg checkout in ffmpeg/Gravatar Uoti Urpala2008-04-28
|/ | | | | | | | | | | | 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/.
* Sync with latest FFmpeg changes.Gravatar diego2008-04-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26435 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge simplifications from FFmpeg r12764.Gravatar diego2008-04-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26349 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg's shiny new non-recursive build system.Gravatar diego2008-04-07
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26347 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync with FFmpeg r12599Gravatar diego2008-03-26
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26278 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync with FFmpeg r12398Gravatar diego2008-03-10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26217 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync with FFmpeg r12354Gravatar diego2008-03-07
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26187 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync with FFmpeg r10874Gravatar diego2007-10-30
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24886 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r10774.Gravatar diego2007-10-18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24803 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r9278.Gravatar diego2007-06-10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23544 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r7699.Gravatar diego2007-01-25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22010 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r7634.Gravatar diego2007-01-21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21993 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r7167.Gravatar diego2006-11-25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21226 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r6700.Gravatar diego2006-10-15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20233 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r6642.Gravatar diego2006-10-11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20158 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r6563.Gravatar diego2006-10-05
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20074 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with FFmpeg r6543.Gravatar diego2006-10-03
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20022 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync with FFmpeg r5930Gravatar diego2006-08-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19381 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync with FFmpeg r5718Gravatar diego2006-07-11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19021 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with upstream.Gravatar diego2006-04-27
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18312 b3059339-0415-0410-9bf9-f77b7e298cf2
* update config.mak to match ffmpeg's version (fix alpha compilation)Gravatar aurel2006-02-27
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17701 b3059339-0415-0410-9bf9-f77b7e298cf2
* Import common.mak v1.1 from ffmpeg cvs, now it's needed by the buildingGravatar rtognimp2006-02-14
system git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17628 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 14:39:37 +0000