1
0
mirror of https://github.com/mpv-player/mpv synced 2025-02-22 07:46:55 +00:00
Commit Graph

2399 Commits

Author SHA1 Message Date
reimar
06c6130710 Cosmetics/indentation fixes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31052 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 20:24:01 +00:00
reimar
903dedd64f Add workaround for aac-sbr-ffaac-slow.mkv playing to slow with FFmpeg
AAC decoder due to wrong sample rate in container.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31051 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 20:22:49 +00:00
lorenm
c462186142 Tell x264 that we aren't going to give it timestamps.
Fixes some warnings starting in x264-r1480.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31049 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 09:14:54 +00:00
zuxy
6fe158d7e7 Replace memalign(x) (x > 8) by av_malloc() to prevent crashes on systems
lacking memalign(), e.g. Win32.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31045 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 04:33:00 +00:00
reimar
c0aa5c32b2 Move functions that really do not need to be inlined from the header
to the .c file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31038 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-15 05:39:36 +00:00
iive
e16f02fe40 Fix build due to FFmpeg r22858 change (function rename).
Patch by ubitux on irc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31033 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-12 20:03:26 +00:00
diego
86ea8d4f4a Fix build after FFmpeg symbol rename:
ff_eval2      --> ff_parse_and_eval_expr
ff_parse_eval --> ff_eval_expr
patch by ubitux, ubitux gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31031 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-12 08:03:39 +00:00
iive
e3ed371d51 Fix build due to FFmpeg r22833 change (typedef rename).
Found by ubitux on irc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31029 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-11 13:47:13 +00:00
diego
9ceb70782b cosmetics: Reorder some x86-related preprocessor conditionals.
This fixes two of the following warnings on non-x86 machines:
libmpcodecs/vf_gradfun.c:388:5: warning: "HAVE_EBX_AVAILABLE" is not defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31025 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-06 09:46:47 +00:00
reimar
d55c67d157 Change ifdefs to make more sense: HAVE_SSSE3 should only be around SSSE3-code,
not around MMX code etc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31018 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 16:38:40 +00:00
diego
935147dd64 Mark vf_size_preset_fields m_option_t array as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31001 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:15:08 +00:00
diego
75fad5bac6 Mark encoder-related m_option_t struct arrays as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30997 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 15:59:09 +00:00
diego
ff93cd656b Add a header for x264enc_set_param() instead of forward declaring it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30991 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 14:20:34 +00:00
diego
8b4b82d008 Remove pointless #ifdef CONFIG_LIBAVCODEC preprocessor check.
The file is only compiled if that condition is true.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30990 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 13:51:14 +00:00
reimar
91ec3ae682 Fix crash with incomplete yuv2 frames.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30972 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-28 00:08:28 +00:00
diego
a8a34f32a1 Convert asm keyword to __asm__.
Neither the asm() nor the __asm__() keyword is part of the C99
standard, but while GCC accepts the former in C89 syntax, it is not
accepted in C99 unless GNU extensions are turned on (with -fasm).
The latter form is accepted in any syntax as an extension (without
requiring further command-line options).

Sun Studio C99 compiler also does not accept asm() while accepting
__asm__(), albeit reporting warnings that it's not valid C99 syntax.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30962 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-26 08:13:10 +00:00
diego
db734715dc Fix build due to codecs_path vs. codec_path typo.
patch by Erik Auerswald, auerswal unix-ag.uni-kl de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30950 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 19:40:37 +00:00
diego
5e480c7b81 Get rid of pointless def_path variable; use codec_path directly instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30949 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 18:01:00 +00:00
diego
cb26eaf0bb Real binary loader code should respect the binary codec path.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30948 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 17:52:46 +00:00
diego
70c66c0476 Rename get_path.[ch] --> path.[ch].
These files now contain different functions related to path handling.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30943 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-20 23:38:27 +00:00
diego
a06a3d476d Move SetCodecPath() from loader to get_path.c and make it unconditional.
This fixes compilation with the Win32 loader disabled but other binary
codec loaders enabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30942 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-20 23:27:07 +00:00
reimar
443a427b0e Remove unnecessary size limits and a related define for hm12 decoder.
Patch by Stephen Warren [swarren nvidia com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30940 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-19 19:44:02 +00:00
diego
a04b23c3b3 Drop support for XANIM_MOD_DIR environment variable.
It is now possible to specify alternative codec paths on the comand line.
Furthermore, XANIM_MOD_DIR was never properly documented.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30936 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 23:37:57 +00:00
diego
0e1acdbf9b Reuse codec path variable used in the binary loader in the XAnim loader.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30935 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 23:32:14 +00:00
aurel
3f8efed4d9 cosmetics: indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30933 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 21:53:53 +00:00
aurel
4709cde305 add support for lavf style extradata in vd_theora
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30932 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 21:53:02 +00:00
diego
e4905ab24f Remove unused variable, fixes the warning:
libmpcodecs/vd_qtvideo.c:242: warning: unused variable 'result'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30912 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 14:35:43 +00:00
sesse
9ffcd31e7d Fix libmpcodecs/vd_qtvideo.c compilation on OS X:
- Declare the "result" variable even for native QuickTime.
 - ExitMovies returns void; don't check its result value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30911 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 14:30:31 +00:00
sesse
45fd2e0457 Use the high-level QuickTime decoding APIs (DecompressSequenceFrameS and
friends) instead of the unsupported, internal ones (ImageCodecBeginBand
etc.). This is a prerequisite for, among others, Apple ProRes 4:2:2 support,
and simplifies the file by quite a bit.

Tested on Linux with all existing QuickTime codecs I could get to work in the
first place; qt261, qtavui, qtsvq3 have no change. qtcvid appears to not give
bit-exact the same output as before, but it looks just the same in playback
to me. qt3ivx stops crashing on exit (so works better than before). With some
extra patches and a codecs.conf entry, ProRes 4:2:2 also works, including on
Linux.

Since codec initialization is now actually done on decoder init instead of on
first frame, fallback should also work a bit better (although usually, qtvideo
is last in the chain). Also made the decoder complain explicitly if the
demuxer data is not there (ie., the user tried to run without -demuxer mov).

This patch is a cleaned up version of what Andrew Wason (rectalogic A
rectalogic D com) posted to mplayer-dev-eng in June.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30899 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 12:05:56 +00:00
diego
aee9749bca Replace separate Win32, XAnim and Real codec directories by one global dir.
Nowadays MPlayer does not use the codecs from other installed programs.
A runtime setting will soon take over the rare case that binary codecs
should be searched for in non-standard directories.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30888 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-14 16:13:32 +00:00
reimar
d06c04bb67 Support extradata format of the speex.acm windows codec formerly available
from openacm.org.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30884 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-12 18:19:51 +00:00
reimar
fdd4ddccd4 Fix crash if speex_packet_to_header fails.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30883 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-12 17:29:48 +00:00
sesse
a8804d4d71 Fix QuickTime emulated OSErr type.
The OSErr type on Mac OS X is int16_t, not int32_t (see
http://developer.apple.com/mac/library/documentation/QuickTime/Reference/QTRef_DataTypes/Reference/reference.html).
The upper 16 bits will typically be something random (they're entirely
undefined). Change the type so it's right; a few places tried to compensate
for this by masking out the upper bits, but a few places also missed them,
which made for unpredictable behavior.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30854 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-06 11:12:32 +00:00
greg
ca7cbc0724 Enable ASS/SSA subtitle support in mencoder
Enable ASS/SSA rendering through libass in mencoder. This duplicates a
bit of code (to parse font attachments, for example). Additionally, add
a filter "fixpts" that generates PTS, simulating fixed fps. PTS
generated by this filter are then used for subtitle timing.

Original patch by Nicolas George. (nicolas.george normalesup.org)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30849 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 23:13:08 +00:00
reimar
57f4448e7a Partially revert r30645, the final output format is determined by
mpcodecs_config_vo so we need to query it afterwards.
Still try to set a more sensible, codec-dependant preferred format even
though it is currently ignored.
Fixes bug #1659, based on patch by Andrew Wason [rectalogic rectalogic com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30824 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-03 21:32:31 +00:00
reimar
e86ecdac03 Reuse the keyframe flag from x264 instead of trying to derive it on our own.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30790 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 07:52:34 +00:00
reimar
4d08f30d25 Use the KEYFRAME define instead of some magic number.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30789 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 07:45:23 +00:00
cehoyos
6c0da216d7 Get rid of many ugly casts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30786 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 01:06:09 +00:00
cehoyos
fd21cdeb47 Make close_toolame() static, only used in ae_toolame.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30785 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 00:28:14 +00:00
cehoyos
aa4388fea4 Make close_twolame() static, only used in ae_twolame.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30783 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 00:23:58 +00:00
cehoyos
5a1eca395c Actually use existing uninit() function in remove_logo filter.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30778 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-27 22:32:25 +00:00
cehoyos
f21d2dcc7e Make function Gsm_Long_Term_Synthesis_Filtering() static, only used in xa_gsm.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30772 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-27 21:02:14 +00:00
diego
0d7e91b104 Mark all fmt_list arrays as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30750 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 19:56:03 +00:00
diego
2ec8252503 Mark vf_opts/vf_opts_fields structures as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30749 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 17:21:06 +00:00
diego
b63759b175 Do not cast the results of malloc/calloc/realloc.
These functions return void*, which is compatible with any pointer,
so there is no need for casts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 15:01:37 +00:00
reimar
25f353346d Add const to mpvdec declaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30734 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-25 22:23:58 +00:00
reimar
5a2289137f Fix check for wrong variable: len can be unitialized but not normally < 0,
the return value needs to be checked to detect an error.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30732 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-25 22:06:05 +00:00
diego
5206db7e60 Mark member info of struct ad_functions_s as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30705 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 14:04:39 +00:00
diego
b2172f784d Mark a bunch of video filter structures as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30704 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 14:03:46 +00:00
diego
50e3d811db Remove commented-out cruft line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30703 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 14:02:18 +00:00