1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-29 10:32:15 +00:00
Commit Graph

29973 Commits

Author SHA1 Message Date
diego
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
diego
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
lorenm
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
diego
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
cehoyos
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
diego
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
cehoyos
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
adrian
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
compn
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
compn
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
compn
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
compn
42448dd3a4 add coreavc entry, works on windows only.
and only after buying the codec and installing it.
the codec will then read the serial from your windows registry.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29695 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-20 12:13:36 +00:00
reimar
d410371fa2 Add autodetection for ARM NEON SIMD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29694 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-19 13:58:38 +00:00
reimar
4aeef29590 Use a compilation check to distinguish between x86 and x86_64, uname and
CFLAGS checks alone are not reliable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29693 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-19 13:36:58 +00:00
reimar
a7845321db Add a check for availability of ebx register, needed for
architectures that require PIE like Haiku or 64 bit OSX.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29692 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-19 13:18:48 +00:00
reimar
37925f4a2e Treat Haiku as BeOS (only changes the displayed name actually)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29691 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-19 12:56:19 +00:00
reimar
bf52efc804 Re-add some ifdefs, partially reverting r29688, since mDisplay and
mScreen are undefined during a Windows build without X11 support.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29690 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-18 18:46:12 +00:00
reimar
f5c7d8c92f Use vo_w32_window directly instead of via the vo_window macro in Windows-only code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29689 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-18 18:25:17 +00:00
reimar
2eab60ecf3 Get rid of several (probably) pointless ifdefs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29688 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-18 16:51:19 +00:00
reimar
dffa8cb272 Use ecx instead of ebx to avoid unnecessary issues with PIC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29687 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-17 19:03:31 +00:00
ramiro
d41ec8ed48 Cleanup buffer debugs in swScale().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29686 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-16 22:34:48 +00:00
ramiro
b769ea34ea Use correct buffers in vertical scaler in unscaled YV12 case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29685 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-16 22:31:43 +00:00
reimar
4dae2a980c Merge two Windows-specific #if sections to simplify the condition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29684 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-16 18:09:48 +00:00
reimar
1782e34b55 Hack: set DEP/NX on Windows via SetProcessDEPPolicy.
This should really be done via the NXCOMPAT PE flag, but looks like
binutils will not get support for it any time soon and not having this
security feature enabled is just ridiculous.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29683 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-16 18:07:19 +00:00
compn
11ce51e3f0 add YAXPAX and YAPAXI exports to msvcr80
fixes kegavideo binary codec
patch by Roberto Togni


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29682 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-16 12:14:17 +00:00
reimar
ae72cfc729 Add several HAVE_EBX_AVAILABLE conditions where necessary
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29681 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-14 14:47:56 +00:00
reimar
061da8b24b %lf is not a valid printf format specifier, use just %f instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29680 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-14 13:16:35 +00:00
compn
60287b1acb kegavideo codec requires msvcr80 on windows
remove incorrect out colorspace


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29679 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-14 10:26:53 +00:00
reimar
426bd1b1e1 Add support for decoding sgi files via FFmpeg's sgi decoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29678 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-14 09:47:08 +00:00
reimar
bd44692ac7 Get rid of useless indirection and use the demuxer argument directly instead of
ds->demuxer.
This makes it also work again with -audiofile without having to add more hacks to
demux_demuxers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29677 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-14 08:51:00 +00:00
reimar
22986e51c1 Reduce verbosity if demuxer sets an info value to the same as the current value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29676 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-14 08:29:18 +00:00
ramiro
b2b8779831 Reset slice direction at end of each frame.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29675 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-13 01:49:40 +00:00
ramiro
03343659ca Remove ; after while(0) in macros.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29674 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-12 20:10:22 +00:00
compn
77cb01d34f add kega video binary codec for fourcc kgv1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29673 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-12 16:49:11 +00:00
jrash
7352779ed8 sync with en/mplayer.1 r29661
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29672 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-12 06:10:42 +00:00
Gabrov
8768c51828 synced with r29670
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29671 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-11 15:47:43 +00:00
diego
2acf75aeed Convert to UTF-8.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29670 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-10 18:35:10 +00:00
diego
37677802e5 Fix bashism: Use '$(( ))' syntax instead of '(( ))' for arithmetic expressions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29669 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-10 18:29:34 +00:00
reimar
86ff541253 Add w64 to list of preferred lavf formats (otherwise demux_audio incorrectly
claims the Wave64 files but can not handle them).
Patch by Daniel Verkamp [daniel drv nu].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29668 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-10 17:30:02 +00:00
reimar
cd5fa27550 Sort preferred_list alphabetically since the order does not matter otherwise.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29667 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-10 17:28:35 +00:00
reimar
d5d5bbbb35 Always keep a backup of the expand values from the command-line, so values
will be recalculated correctly e.g. after aspect change and -vf expand=aspect=4/3
command line.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29666 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-10 16:49:20 +00:00
ramiro
927afdcf6d Document that slices can be bottom to top or top to bottom.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29665 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-09 21:43:25 +00:00