1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-31 04:02:06 +00:00
Commit Graph

32310 Commits

Author SHA1 Message Date
diego
5b87176faa vf_sab, vf_smartblur: add "const" to match swscale API
Mark srcArray as const pointer to const data, fixes the warnings:
libmpcodecs/vf_sab.c:183: warning: passing argument 2 of 'sws_scale' from incompatible pointer type
libmpcodecs/vf_smartblur.c:134: warning: passing argument 2 of 'sws_scale' from incompatible pointer type

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32220 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
diego
eb67fe1a34 vo_corevideo.h: Add standard multiple inclusion guards
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32210 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
reimar
5896036cb3 demux_nemesi: Remove a pointless if
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32208 b3059339-0415-0410-9bf9-f77b7e298cf2

Reindent.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32209 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
reimar
fe6c4fcae2 cleanup: malloc+memset->calloc, sizeof(TYPE)->sizeof(*ptr)
Replace malloc+memset by calloc

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32181 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32182 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32183 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace some sizeof(type) by sizeof(*pointer)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32184 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32186 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32187 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32188 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace sizoef(type) by sizeof(*ptrvar).
Besides being consistent with FFmpeg style,
this reduces the size of a patch to rename these
types to not conflict with the windows.h definitions.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32189 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32191 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32192 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace sizeof(type) by sizeof(*ptrvar)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32193 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove a useless cast.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32194 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace sizeof(type)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32195 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove a useless cast.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32196 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace several sizeof(WAVEFORMATEX)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32197 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace one more instance of sizeof(WAVEFORMATEX); fix compilation.
patch by Clément Bœsch, ubitux gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32199 b3059339-0415-0410-9bf9-f77b7e298cf2

Avoid some pointless uses of sizeof() and one related cast.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32200 b3059339-0415-0410-9bf9-f77b7e298cf2

Merge one malloc() + memset() invocation into calloc().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32202 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32203 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace sizeof(WAVEFORMATEX) occurrences.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32205 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32206 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace sizeof(BITMAPINFOHEADER)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32207 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
Uoti Urpala
fcdeaadeae cosmetics: reformat vf_ass to K&R style 2010-11-02 04:16:46 +02:00
Uoti Urpala
24dfc70a08 mpcommon.h: reduce header dependencies on other headers
Use "struct foo *ptr" without full definition of the struct, instead
of using typedef names and including other headers for them.
2010-11-02 04:16:46 +02:00
diego
4093dd23af configure: change Apple remote test to just compile, not run
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32175 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
diego
a64cd8d3c8 stream/tv: move free_handle() from header to tv.c
Move TV input free_handle static function to tv.c and make it non-static.
There is no need to duplicate the function in the binary.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32174 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
Uoti Urpala
1913d92f25 configure: remove duplicated CFLAGS from DEPFLAGS
The DEPFLAGS definition included the CFLAGS variable. All uses of
DEPFLAGS in Makefile use CFLAGS too, so this resulted in duplicated
options. Make DEPFLAGS contain "-MD -MP" only.
2010-11-02 04:16:46 +02:00
diego
14ff4026c2 configure: Separate compiler warning flags from other flags
This allows setting some warning flags for C but not for C++ and fixes
a bunch of warnings that resulted from compiling C++ files with C-only
warning flags.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32173 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32227 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
diego
44f851a3ed demux_rtp: Remove pointless typedef keyword
Remove "typedef" from struct RTPState declaration; fixes:
libmpdemux/demux_rtp.cpp:90: warning: 'typedef' was ignored in this declaration

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32170 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
diego
956d11235c osdep/macosx_finder_args.h: include required header m_config.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32166 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
diego
0feeb9a000 cosmetics: av_sub
cosmetics: Break some long lines.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32164 b3059339-0415-0410-9bf9-f77b7e298cf2

cosmetics: Add #endif comment.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32165 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
diego
be67d71493 loader: Move local_wm extern variable declaration to loader.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32161 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
diego
e02012a4af vo_ivtv; Move ivtv_fd extern variable declaration to vo_ivtv.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32159 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
diego
816da6109a vo_v4l2: Move v4l2_fd extern declaration to vo_v4l2.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32158 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
diego
e0f8f99a19 ao_mpegpes,vo_mpegpes: Rename vo_mpegpes_fd2 variable to ao_mpegpes_fd
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32154 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
diego
72f5f69200 cosmetics: input/ar.c: Mark is_mplayer_front() static
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32153 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
Uoti Urpala
255325a9c2 ass_mp.[ch]: #include "config.h"
It was indirectly included through subreader.h but better do it
explicitly. ass_mp.h also included itself, remove that.
2010-11-02 04:16:45 +02:00
diego
3b43c4fee5 loader: Move fs_seg extern variable declaration to ldt_keeper.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32133 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
diego
2d215fdb7d mplayer.c: remove unnecessary #define
Remove cache_fill_status #define.
The #define is only set if CONFIG_STREAM_CACHE is not defined,
but in this case the variable is not used.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32131 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
jrash
d8c6e479a1 DOCS/man/zh_CN: Synced with rev. 32066
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32130 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
diego
8e16ab8898 cosmetics: mplayer.c: Remove obsolete declarations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32126 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
diego
01d8326435 cache: Remove unused cache_stats function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32121 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
diego
77fb7376e4 cache: Move cache_fill_status extern declaration to cache2.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32120 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
Uoti Urpala
62112dedb0 enable vo_mga, vo_xmga, vf_palette, vf_halfpack
Nothing should depend on libswscale internals any more, so re-enable
everything. vf_palette and vf_halfpack were actually fixed earlier but
were not properly enabled.
2010-11-02 04:16:45 +02:00
diego
9b00269483 vf_fixpts: Mark vf_info_t declaration const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32118 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
diego
b87c4e15b8 cosmetics: mpcommon.h: Group all extern variable declarations together
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32113 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
ramiro
fdce82091e mga: disable g200 support
g200 should use the swscale interface to convert to nv12. If anyone still uses
such a card and is willing to test, just let me know.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32111 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
diego
691aa62ed6 stream/http.c: Move mime_type_table extern declaration to network.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32108 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
diego
7a3fe6ccdb menu: Move vf_info_menu extern declaration to menu.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32089 b3059339-0415-0410-9bf9-f77b7e298cf2

Mark vf_info_menu declaration as const.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32109 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
Uoti Urpala
48237126ae cosmetics: remove "_s" prefix from "struct vf_info_s" 2010-11-02 04:16:45 +02:00
diego
32ac9c6547 menu: Move menu_mouse_* extern declarations to menu.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32084 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
diego
2ea247fddf cosmetics: Remove commented-out mpcodecs_ad_null leftovers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32058 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
reimar
545f64c5cb vobsub.c: Remove useless casts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32053 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
reimar
a027b5533f configure: Add a hack to work with BeOS/Haiku libsdl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32045 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
diego
f2899d96ee Add central init_avcodec() to avoid duplicated libavcodec init code
Patch by Vlad Seryakov, vseryakov gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32043 b3059339-0415-0410-9bf9-f77b7e298cf2

Refactor more instances of avcodec_initialized handling into init_avcodec().
This is a leftover from the previous commit.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32044 b3059339-0415-0410-9bf9-f77b7e298cf2

Add missing #include for vd_ffmpeg.h; fixes the warning:
libmpcodecs/vf_zrmjpeg.c:472: warning: implicit declaration of function 'init_avcodec'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32176 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:51 +02:00
Uoti Urpala
a92b4adf61 Makefile: remote obsolete dep/depend targets, mark "locales" phony 2010-11-02 04:15:50 +02:00
diego
ed3a57ae28 Makefile: Move header compilation rules to the bottom of the rules list
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32042 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:50 +02:00
reimar
8172eec08d configure: Attempt to fix compilation with FreeBSD's dvdio.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32039 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
reimar
039574d8d4 vd_ffmpeg: Set avctx->coded_width/coded_height instead of width/height
That's how it is supposed to be done.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32037 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
compn
0f985365fb codecs.conf: add fourcc AMV2, WAWV
add binary codec for fourcc AMV2
add fourcc WAWV to ffodivx and ffodivxvdpau

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32034 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
aurel
343bdac280 subreader: fix crash with un-commonly formated ASS files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32033 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
reimar
dec2db6326 demux_lavf: Always use convergence_duration for subtitles
Otherwise subtitles will stay on screen forever for ASS subtitles in
mkv if no ASS renderer is used.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32032 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
reimar
415b948f2e demuxer.c: reset subtitle EOF on seeking
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32031 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
reimar
5c083f82ca loader: Disable loading codecs from the current directory
While convenient, it is too risky.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32025 b3059339-0415-0410-9bf9-f77b7e298cf2

100l, we need to search for SetDllDirectoryA instead of SetDllDirectory

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32026 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
reimar
04b8751a5c configure: make libarts check verify linking
Fix arts check to actually check linking so it doesn't
get enabled when e.g. cross-compiling under Linux for Windows.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32024 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
compn
26fb47e54c codecs.conf: add matchware screen codec fourcc MWSC
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32022 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
reimar
477769e6b3 manpage: Clarify the meaning of the -nosub option
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32014 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
diego
740c927976 ad_ffmpeg, vd_ffmpeg: remove pointless casts
Remove pointless casts of avcodec_find_decoder_by_name() return value.
avcodec_find_decoder_by_name() already returns AVCodec*, so there is
no need to cast the return value to this type.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32007 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00