1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-18 21:31:13 +00:00
mpv/libmpcodecs
uau a0a5afc0c5 ve_vfw.c: #include aviheader.h instead of wine avifmt.h
Compilation was broken after libmpdemux/muxer.h started including
libmpdemux/aviheader.h. ve_vfw.c included both muxer.h and
loader/wine/avifmt.h, and the latter has definitions that conflict with
aviheader.h ones. Fix by removing the avifmt.h include.

I did not carefully check that changing the includes doesn't break
any ve_vfw.c code. However it at least fixes compilation, and if the
avifmt.h versions differ in some significant way then the code is
fundamentally broken anyway: ve_vfw cannot use different versions of
the avi struct definitions when it also uses shared muxer.h types
(those must use the standard definitions to keep the type compatible
with what's used in other files).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26178 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-06 01:57:26 +00:00
..
native FFmpeg now uses different (unified) #include paths. 2008-02-25 15:46:36 +00:00
ad_acm.c
ad_alaw.c
ad_dk3adpcm.c
ad_dmo.c Fix all current known multi-channel wrong order problems by adding 2007-12-10 16:53:30 +00:00
ad_dshow.c
ad_dvdpcm.c
ad_faad.c Use malloc for codecdata. Fixes segfault in free_sh_sub. 2008-01-10 19:47:18 +00:00
ad_ffmpeg.c Fix ffvorbis decoder's output channel order with channel reordering function. 2008-03-05 02:46:50 +00:00
ad_hwac3.c Fix warnings: 2007-11-27 00:33:59 +00:00
ad_hwmpa.c
ad_imaadpcm.c
ad_internal.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
ad_liba52.c
ad_libdca.c Prevent from outputing mass of 'skip' log messages in verbose level. 2007-12-05 18:24:40 +00:00
ad_libdv.c
ad_libmad.c
ad_libvorbis.c
ad_mp3lib.c
ad_mpc.c
ad_msadpcm.c
ad_msgsm.c
ad_pcm.c Fix all current known multi-channel wrong order problems by adding 2007-12-10 16:53:30 +00:00
ad_qtaudio.c
ad_realaud.c
ad_sample.c
ad_speex.c
ad_twin.c
ad.c
ad.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
ae_faac.c Fix all current known multi-channel wrong order problems by adding 2007-12-10 16:53:30 +00:00
ae_faac.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
ae_lame.c Remove unused static variable pass, fixes the warning: 2007-12-27 11:19:54 +00:00
ae_lame.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
ae_lavc.c FFmpeg now uses different (unified) #include paths. 2008-02-25 15:46:36 +00:00
ae_lavc.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
ae_pcm.c Fix all current known multi-channel wrong order problems by adding 2007-12-10 16:53:30 +00:00
ae_pcm.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
ae_toolame.c
ae_toolame.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
ae_twolame.c
ae_twolame.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
ae.c
ae.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
cmmx.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
dec_audio.c typo fix: inited --> initialized 2008-02-14 14:23:55 +00:00
dec_audio.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
dec_video.c typo fix: inited --> initialized 2008-02-14 14:23:55 +00:00
dec_video.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
img_format.c
img_format.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
Makefile Remove ugly workaround for conflicting dca.h headers, it is no longer 2008-03-03 19:40:39 +00:00
mp_image.c
mp_image.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
mpc_info.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
pullup.c Add a check for c->head being NULL in pullup_free_context(). 2007-09-08 14:43:10 +00:00
pullup.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
vd_dmo.c
vd_dshow.c
vd_ffmpeg.c FFmpeg now uses different (unified) #include paths. 2008-02-25 15:46:36 +00:00
vd_hmblck.c
vd_ijpg.c Colourspace conversions do _not_ belong into a decoder! 2008-01-12 15:26:24 +00:00
vd_internal.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
vd_libdv.c
vd_libmpeg2.c Avoid reinit of vo with the exactly same parameters over and over. 2008-02-16 14:31:34 +00:00
vd_lzo.c FFmpeg now uses different (unified) #include paths. 2008-02-25 15:46:36 +00:00
vd_mpegpes.c
vd_mpng.c
vd_mtga.c
vd_null.c
vd_nuv.c
vd_qtvideo.c typo fix: inited --> initialized 2008-02-14 14:23:55 +00:00
vd_raw.c Add support for Apple's yuv2 raw format 2007-11-30 11:31:31 +00:00
vd_realvid.c typo fix: inited --> initialized 2008-02-14 14:23:55 +00:00
vd_sgi.c
vd_theora.c
vd_vfw.c Check ICDecompressGetFormatSize to avoid crashes. 2007-10-21 13:15:48 +00:00
vd_vfwex.c
vd_xanim.c
vd_xvid4.c Make m_option_t arrays referenced by cfg-common.h const 2007-12-02 21:26:23 +00:00
vd_zrmjpeg.c typo fix: inited --> initialized 2008-02-14 14:23:55 +00:00
vd.c typo fix: inited --> initialized 2008-02-14 14:23:55 +00:00
vd.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
ve_lavc.c FFmpeg now uses different (unified) #include paths. 2008-02-25 15:46:36 +00:00
ve_libdv.c
ve_nuv.c
ve_qtvideo.c typo fix: inited --> initialized 2008-02-14 14:23:55 +00:00
ve_raw.c
ve_vfw.c ve_vfw.c: #include aviheader.h instead of wine avifmt.h 2008-03-06 01:57:26 +00:00
ve_x264.c Fix illegal identifiers: Names starting with __ or _ and uppercase are reserved 2008-01-06 23:20:15 +00:00
ve_xvid4.c FFmpeg now uses different (unified) #include paths. 2008-02-25 15:46:36 +00:00
ve.c clarify comments/docs about lav* being the preferred place to implement new 2008-01-28 22:09:21 +00:00
vf_1bpp.c begin moving const filter data to .text/.rodata sections 2007-11-09 06:58:32 +00:00
vf_2xsai.c Remove unused variable 2008-01-12 15:45:47 +00:00
vf_ass.c Add global ass_force_reload flag. 2008-01-23 21:18:30 +00:00
vf_blackframe.c begin moving const filter data to .text/.rodata sections 2007-11-09 06:58:32 +00:00
vf_bmovl.c begin moving const filter data to .text/.rodata sections 2007-11-09 06:58:32 +00:00
vf_boxblur.c begin moving const filter data to .text/.rodata sections 2007-11-09 06:58:32 +00:00
vf_crop.c begin moving const filter data to .text/.rodata sections 2007-11-09 06:58:32 +00:00
vf_cropdetect.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_decimate.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_delogo.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_denoise3d.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_detc.c Avoid warning: 2008-01-19 11:44:49 +00:00
vf_dint.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_divtc.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_down3dright.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_dsize.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_dvbscale.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_eq2.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_eq.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_expand.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_field.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_fil.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_filmdint.c Remove unnecessary <signal.h> includes 2008-01-09 01:17:49 +00:00
vf_flip.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_format.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_framestep.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_fspp.c Do not use a global temps variable, this is ugly and does not compile with ICC. 2008-02-24 11:39:35 +00:00
vf_geq.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_halfpack.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_harddup.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_hqdn3d.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_hue.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_il.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_ilpack.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_ivtc.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_kerndeint.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_lavc.c FFmpeg now uses different (unified) #include paths. 2008-02-25 15:46:36 +00:00
vf_lavcdeint.c FFmpeg now uses different (unified) #include paths. 2008-02-25 15:46:36 +00:00
vf_mcdeint.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_mirror.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_noformat.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_noise.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_ow.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_palette.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_perspective.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_phase.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_pp7.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_pp.c FFmpeg now uses different (unified) #include paths. 2008-02-25 15:46:36 +00:00
vf_pullup.c Fix typo. 2008-02-13 19:21:39 +00:00
vf_qp.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_rectangle.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_remove_logo.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_rgb2bgr.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_rgbtest.c Allow specifying a size for -vf rgbtest 2008-02-17 19:49:46 +00:00
vf_rotate.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_sab.c FFmpeg now uses different (unified) #include paths. 2008-02-25 15:46:36 +00:00
vf_scale.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_scale.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
vf_screenshot.c FFmpeg now uses different (unified) #include paths. 2008-02-25 15:46:36 +00:00
vf_smartblur.c FFmpeg now uses different (unified) #include paths. 2008-02-25 15:46:36 +00:00
vf_softpulldown.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_softskip.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_spp.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_swapuv.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_telecine.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_test.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_tfields.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_tile.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_tinterlace.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_unsharp.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_uspp.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_vo.c Add global ass_force_reload flag. 2008-01-23 21:18:30 +00:00
vf_yadif.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_yuvcsp.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_yuy2.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_yvu9.c Make all vf_info_t structs const 2007-12-02 14:57:15 +00:00
vf_zrmjpeg.c typo fix: inited --> initialized 2008-02-14 14:23:55 +00:00
vf.c stage 1 of applying const to vf structs 2007-11-09 06:57:24 +00:00
vf.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
vfcap.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
vqf.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00