Uoti Urpala
1db1773ec2
Merge svn changes up to r29277
2009-05-08 23:50:26 +03:00
diego
86c9fb2e89
lirc anc lircc are MPlayer-only, so add LDFLAGS for MPlayer link only.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29277 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 16:21:03 +00:00
cehoyos
238df952ef
Do not use flag CWBackPixel when calling vo_x11_create_vo_window():
...
It leads to VDPAU errors after video aspect ratio changes.
Patch by Stephen Warren.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29276 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 15:43:54 +00:00
diego
5bad4ba482
The Apple remote code needs the Cocoa framework to link.
...
Apple remote LDFLAGS are only necessary for linking MPlayer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29275 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 13:58:42 +00:00
diego
c12922d678
Add -framework Carbon to LDFLAGS when Mac OS X finder or bundle is enabled.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29274 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-07 21:34:56 +00:00
adrian
31886434cd
Adrian is maintaining vo_corevideo and merging the OSX Extended GUI branch.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29273 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-07 21:02:57 +00:00
vitor
19c12794ad
Fix sliced yuv410 -> yuv420 conversion
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29272 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-07 20:41:04 +00:00
jrash
efaa440083
revise previous translation
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29271 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-07 13:16:22 +00:00
jrash
057fc508aa
sync with en/mplayer.1 r29252
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29270 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-07 13:13:54 +00:00
diego
ddb7269a1e
cosmetics: Move Quartz and CoreVideo checks into the vo driver section.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29269 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 23:02:59 +00:00
diego
5bc20d8d3c
LDFLAGS for CoreVideo and Quartz should be MPlayer-only.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29268 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 21:03:56 +00:00
diego
d0022933fe
libdvdcss requires the Carbon framework to link on Mac OS X.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29267 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 18:45:59 +00:00
diego
bf26ad6611
cosmetics: Move $def_dvdcss to a more sensible place in config.h.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29266 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 18:04:53 +00:00
diego
d46d132b1f
cosmetics: Move CoreAudio check to audio output section.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29265 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:57:44 +00:00
diego
bcb63539f4
Add prototype for mp_a52_framesize().
...
This fixes an implicit declaration warning when liba52 is disabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29264 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:36:31 +00:00
diego
ab5760ab33
Add #define for HAVE_DVDCSS_DVDCSS_H (needed by internal libdvdread) to config.h
...
instead of passing -D on the compiler command line.
This is more convenient and already done with most preprocessor definitions
needed by external libraries.
Previously the definition was passed on the command line because libdvdread was
missing the necessary config.h #include, which was now added.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29263 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:30:50 +00:00
diego
32173c6162
Remove pointless #ifdef around spudec.h #include.
...
Fixes the build with dvdread disabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29262 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:27:36 +00:00
diego
a3f5c392f5
cosmetics: indentation
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29261 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:17:17 +00:00
diego
c3d3743ad7
Allow disabling and enabling VCD support through command line parameters.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29260 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:15:54 +00:00
diego
ceb919a8c4
CoreAudio LDFLAGS should be MPlayer-only.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29259 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 09:08:53 +00:00
diego
9b7c75da73
Improve CoreAudio check: Use all required headers and frameworks.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29258 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 08:49:07 +00:00
diego
614a0e9800
Simplify Mac OS X Finder and Mac OS X Bundle file locations checks.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29257 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 08:46:37 +00:00
michael
271357149a
Change VOFW for x86 to 5120, it allows larger images to be scaled and was
...
not slower. Other archs are not changed as the larger VOFW was slower on PPC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29256 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 01:34:16 +00:00
diego
114fa5bd06
CONFIG_QUICKTIME should be set depending on the state of QTX support.
...
This fixes linking on Mac OS X with vo_quartz disabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29255 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 18:29:55 +00:00
diego
d9ded9284c
Add missing 'void' to parameterless function declarations.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 17:35:26 +00:00
diego
56a13121a7
ao_macosx was renamed to ao_coreaudio.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29253 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 16:56:36 +00:00
diego
27bc918ffe
Rename macosx video output driver to corevideo.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29252 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 16:55:05 +00:00
diego
e3ec5b1fd3
Rename macosx audio output driver to coreaudio.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29251 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 14:53:47 +00:00
diego
9f45c3a0ae
QuickTime codecs support requires -framework QuickTime to link on Mac OS X.
...
patch by Emanuele Giaquinta
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29250 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 14:49:42 +00:00
diego
51a6bec160
Replace QuickTime.h #include with Carbon.h, which is really needed.
...
patch by Emanuele Giaquinta
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29249 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 14:40:22 +00:00
diego
d401f12cb5
Ulion no longer has time to be maintainer.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29248 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 14:09:31 +00:00
diego
a094d6279b
Improve CoreVideo check: Test more #includes, add -framework Carbon to LDFLAGS.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29247 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 13:16:04 +00:00
diego
0044b18877
Add information about configure options to config.mak.
...
This is useful for debugging and convenient outside of config.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29246 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 11:44:36 +00:00
Uoti Urpala
f2864e9a07
x11_common.h: Remove declarations of some nonexistent variables
2009-05-04 03:53:50 +03:00
bircoph
fbf9a582f4
Cosmetics for r29244 to follow K&R style closely.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29245 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-03 21:52:41 +00:00
bircoph
e8abba5f43
Support for libbs2b ver. 3.0.0 API.
...
Now filter parameters are highly controllable, virtually all audio
formats are supported, and new profiles are available.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29244 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-03 21:51:37 +00:00
reimar
1ba8ea2d34
Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29243 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-03 20:57:37 +00:00
Uoti Urpala
b863100784
core: Set mpctx->chapters to NULL at uninit
...
The uninit code called talloc_free(mpctx->chapters) but didn't clear
the pointer. As a result playing a file with ordered chapters and one
without almost certainly triggered an abort when closing the second
file. Fix by setting the pointer to NULL after freeing.
2009-05-03 21:48:58 +03:00
sdrik
1a132a4acd
Fix chroma shift when scaling from ARGB on LE and BGRA on BE
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29242 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-02 08:40:53 +00:00
Uoti Urpala
ce35ed0209
vd_ffmpeg.c: Use FFmpeg-mt compatible code for codec delay
...
This code to calculate codec delay should work with both with regular
FFmpeg and FFmeg-mt. This MPlayer version is not completely compatible
with current FFmpeg-mt though, since it has a build system change
which matches upstream FFmpeg but hasn't been integrated in FFmpeg-mt
yet (RUNTIME_CPUDETECT -> CONFIG_RUNTIME_CPUDETECT rename).
2009-04-30 03:54:34 +03:00
bircoph
0763902e02
Fix polish spelling. Noticed in Gentoo ebuild long time ago.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29241 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-27 21:41:42 +00:00
sdrik
c8509646d5
Remove useless duplicated code in yuv2rgb_c_32, yuva2rgba_c and yuva2argb_c
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29240 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-27 14:25:44 +00:00
gpoirier
7c9f344ead
sync w/r29147
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29239 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-27 09:44:59 +00:00
diego
480a9e563c
Revert previous two commits, the CoreVideo vo needs both OpenGL and Cocoa.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29238 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-26 08:59:18 +00:00
diego
aa169c6fe3
Replace glibc-specific __WORDSIZE preprocessor check with HAVE_FAST_64BIT.
...
The latter is properly set by configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29237 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-25 19:09:54 +00:00
diego
ebbeef12db
Fix typo in CoreVideo linker flags: the Carbon, not Cocoa framework is needed.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29236 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-25 18:43:35 +00:00
diego
2ce1ec49e7
Remove unnecessary -framework OpenGL from CoreVideo linker flags.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29235 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-25 18:39:19 +00:00
diego
1668788808
whitespace cosmetics: reindent Mac OS X checks, remove trailing whitespace
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29234 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-25 17:52:55 +00:00
diego
6f9ec12491
Split generic OS X API check into separate CoreAudio, CoreVideo, Quartz checks.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29233 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-25 17:48:48 +00:00
diego
86075b391c
typo in XFORM asm check, noticed by Emanuele Giaquinta
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29232 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-25 16:37:08 +00:00