f806e745e2
Mark some functions that do not need external visibility as static.
...
patch by Alexander Neumann, alexander bumpern de
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29744 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 23:47:00 +00:00
a04087cd67
Extend EBX_AVAILABLE check in a way that works for both OpenBSD/Haiku
...
and 64 bit OSX.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29743 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 18:45:02 +00:00
4b3525f79f
Reduce console output verbosity: Move colorspace information to verbose mode.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29742 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 14:55:43 +00:00
1ad332f8a5
lavf: if seeking in the desired direction failed, also try in the opposite one,
...
otherwise we might end up at some random position (where lavf last ended
up while trying to build the index).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29741 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 08:19:49 +00:00
70cdf76c6a
Avoid void * arithmetic.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29740 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:54:04 +00:00
0b8508274c
Simplify aac_get_sample_rate_index
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29739 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:52:37 +00:00
640d819512
Check for grow_array allocation failure.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29738 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:48:01 +00:00
62a3efebf2
Avoid a possible crash if num_cluster_pos is 0.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29737 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:45:10 +00:00
eb5571e57e
Check for integer overflow in grow_array.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29736 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:41:00 +00:00
aa576e8fc0
Rearrange code of grow_array to make it easier to extend.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29735 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:35:33 +00:00
f6f8acc19a
Avoid a memleak if realloc fails in grow_array.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29734 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:33:05 +00:00
d1b5f6efa1
Change grow_array argument from void ** to void *, this avoids a aliasing
...
violation (thus making gcc 4.4.x compile the code correctly) and allows to get
rid of some casts at the expense of making the code less clear.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29733 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 07:27:43 +00:00
6fa7e2d867
Make -nosub work to disable subtitles even if -slang and dvd streams are used.
...
This still needs some additional checking that subtitle selection via dvdnav works.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29732 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-29 06:44:10 +00:00
55cd87882c
Document -nosub option
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29731 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-28 11:33:40 +00:00
e3625bd232
Add a -nosub option that allows disabling auto-selected subtitles as e.g. the
...
mkv demuxer supports.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29730 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-28 11:32:27 +00:00
76cc7886d8
Allow -1 and -2 values for -aid, -vid and -sid (meaning "auto" and "disabled" respectively).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29729 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-28 11:31:25 +00:00
f43cc7c3cc
Enable loading of external subtitles also for audio-only files.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29728 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-28 11:26:19 +00:00
95d60aa019
Use a_pos to update subtitle for audio-only files instead of mpctx->sh_audio->pts
...
which e.g. for mp3 in AVI never has a useful value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29727 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-28 11:24:13 +00:00
df0cef80f9
Call set_osd_subtitle also for external subs (i.e. in find_subs).
...
This does not yet seem to work for audio-only files, subtitles seem
not to be loaded then.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29726 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-28 11:10:11 +00:00
556cda2071
Intel compiler icc 11.1 supports compilation of internal mp3lib and internal liba52.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29725 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-27 21:25:56 +00:00
205a377349
Cosmetics: Fix whitespace.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29724 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-27 19:22:48 +00:00
a531e51297
Set sensible write frequency/priority values for AllocateMemoryMESA
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29723 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-27 14:33:45 +00:00
f78f32c864
Print error instead of crashing when mesa-buffer is used on systems
...
that do not support it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29722 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-27 14:31:35 +00:00
fe3b9a88ce
Also check GLX client and server strings for extensions
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29721 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-27 14:24:15 +00:00
a5abf5851c
Amend previous commit: both zlib decoder and encoder must be disabled
...
if zlib is not available.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29720 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-26 21:22:01 +00:00
08073d325a
Disable libavcodec zlib decoder when zlib is not available, fixes compilation
...
in that case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29719 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-26 21:09:29 +00:00
ef438b3a6b
osx_common.c: Fix compilation
...
This file should have been fixed when merging it from svn. Broke
compilation with OS X-specific VOs enabled.
2009-09-26 16:22:48 +03:00
09e4467756
Change libaf control ordering to make the controls unique again, (AF_CONTROL_PAN_BALANCE vs.
...
AF_CONTROL_PLAYBACK_SPEED), put them in-order again and add a bit of padding in-between.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29718 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-26 06:41:09 +00:00
ac8b90aec1
Do not override host_arch in x86 vs. x86_64 detection if it was forced via --target.
...
Patch by Andrew Wason [rectalogic rectalogic com]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29717 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-25 16:46:39 +00:00
3f9cacf5d5
Change type to avoid void * arithmetic.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29716 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-25 09:44:41 +00:00
101d331f62
Set codec_type and codec_id in codec context for lavc encoders.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29715 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-25 09:43:59 +00:00
e3b68c2745
Sync with current FFmpeg HEAD.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29714 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-24 10:09:14 +00:00
76141a5727
sync with FFmpeg build: BUILD_STATIC --> CONFIG_STATIC
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29713 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-24 09:47:36 +00:00
4b182ff652
Add support for displaying subtitles on the command-line when playing
...
audio-only files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29712 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-23 21:48:48 +00:00
1b92715364
Make function argument name in header match name in .c file.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29711 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-23 21:27:36 +00:00
bf16f6f4f3
Make update_subtitles work without sh_video for text subtitles.
...
This fixes a crash with e.g. auto-enabled subtitles and -novideo due to
command.c calling update_subtitles even without video and is a step
toward subtitle support for audio-only files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29710 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-23 21:21:58 +00:00
4834e21162
Make sure avctx->codec_type and codec_id are set, since libavcodec
...
currently requires that.
That probably is an unintended API change and should be fixed/reverted
in lavc but it hurts little to workaround here.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29709 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-23 19:21:38 +00:00
f9c8809a39
Include mpcommon.h in mpcommon.c, ensures that the declarations in the header
...
match those in the file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29708 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-23 19:04:24 +00:00
8dad891bf9
Factor out sh_video->pts into a refpts variable. This simplifies a future patch
...
that reduces the dependency on sh_video.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29707 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-23 19:01:33 +00:00
5c6d055a15
Rename ambiguous "pts" variable to subpts.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29706 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-23 18:28:20 +00:00
de85aebe1e
Use x264_encoder_delayed_frames instead of the current hack to flush delayed
...
frames in VFCTRL_FLUSH_FRAMES.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29705 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-23 12:26:44 +00:00
1893615656
sync to x264-r1260 (which changed api)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29704 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-23 12:01:04 +00:00
f318d4c900
Add 0x85 ad ID for DTS audio.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29703 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-23 09:12:19 +00:00
4c86e46cca
Fix teletext font autoscaling.
...
Patch by Francesco Lavra, francescolavra interfree it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29702 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-22 22:06:51 +00:00
5b3208baf2
Replace manual gcc version check by AV_GCC_VERSION_AT_LEAST macro.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29701 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-22 14:38:49 +00:00
a1e5f14ed1
Allow playback of dnxhd files, as produced by FFmpeg regression test.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29700 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-22 00:02:05 +00:00
7bc4102a08
Fix vo_corevideo with shared buffer after r29606: Only do GUI dependent display config if shared buffer is not enabled.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29699 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-20 19:07:57 +00:00
a40c6e2018
sync faad / ffaac supported fourccs as spotted by reimar
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29698 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-20 14:41:35 +00:00
541888558a
add another aac tag
...
patch by william0wang (mplayer-ww)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29697 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-20 12:41:21 +00:00
e0f6b6051d
add newer microsoft screen binary codec
...
patch by william0wang (mplayer-ww).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29696 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-20 12:31:36 +00:00
diego
reimar
cehoyos
Uoti Urpala
lorenm
adrian
compn