Uoti Urpala 42bf12c2d3 Merge svn changes up to r30595 ...

Conflicts:
	mplayer.c
	vidix/nvidia_vid.c

2010-03-09 23:37:00 +02:00

..

native

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_acm.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_alaw.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_dk3adpcm.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_dmo.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_dshow.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_dvdpcm.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_faad.c

Mark all ad_info_t/vd_info_t structure declarations as const.

2010-02-12 16:29:34 +00:00

ad_ffmpeg.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_hwac3.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_hwmpa.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_imaadpcm.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_internal.h

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_liba52.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_libdca.c

Mark all ad_info_t/vd_info_t structure declarations as const.

2010-02-12 16:29:34 +00:00

ad_libdv.c

Merge svn changes up to r30595

2010-03-09 23:37:00 +02:00

ad_libmad.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_libvorbis.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_mp3lib.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_mp3lib.h

Add header file for mplayer_audio_read() instead of forward declaring it.

2010-02-16 13:16:17 +00:00

ad_mpc.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_msadpcm.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_msgsm.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_pcm.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_qtaudio.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_realaud.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_sample.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad_speex.c

Merge svn changes up to r30550

2010-03-09 23:03:14 +02:00

ad_twin.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ad.h

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ae_faac.c

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

ae_faac.h

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

ae_lame.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ae_lame.h

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

ae_lavc.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ae_lavc.h

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

ae_pcm.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ae_pcm.h

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

ae_toolame.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ae_toolame.h

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

ae_twolame.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ae_twolame.h

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

ae.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ae.h

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

cmmx.h

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

dec_audio.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

dec_audio.h

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

dec_teletext.c

…

dec_teletext.h

…

dec_video.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

dec_video.h

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

img_format.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

img_format.h

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

mp_image.c

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

mp_image.h

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

mpc_info.h

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

pullup.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

pullup.h

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

vd_dmo.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_dshow.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_ffmpeg.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_hmblck.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_ijpg.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_internal.h

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_libdv.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_libdv.h

Add header for init_global_rawdv_decoder() instead of forward declaring it.

2010-02-16 14:52:59 +00:00

vd_libmpeg2.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_lzo.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_mpegpes.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_mpng.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_mtga.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_null.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_qtvideo.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_raw.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_realvid.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_sgi.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_theora.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_vfw.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_vfwex.c

…

vd_xanim.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd_xvid4.c

Mark all ad_info_t/vd_info_t structure declarations as const.

2010-02-12 16:29:34 +00:00

vd_zrmjpeg.c

Mark all ad_info_t/vd_info_t structure declarations as const.

2010-02-12 16:29:34 +00:00

vd.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vd.h

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ve_lavc.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ve_libdv.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ve_nuv.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ve_qtvideo.c

…

ve_raw.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ve_vfw.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

ve_x264.c

…

ve_xvid4.c

…

ve.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_1bpp.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_2xsai.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_ass.c

libass: fix PAR correction

2010-02-09 17:36:24 +00:00

vf_blackframe.c

…

vf_bmovl.c

…

vf_boxblur.c

…

vf_crop.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_cropdetect.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_decimate.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_delogo.c

…

vf_denoise3d.c

…

vf_detc.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_dint.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_divtc.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_down3dright.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_dsize.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_dvbscale.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_eq2.c

Remove stray '/' from comment block, fixes the warning:

2010-02-13 21:32:19 +00:00

vf_eq.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_expand.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_field.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_fil.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_filmdint.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_flip.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_format.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_framestep.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_fspp.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_geq.c

…

vf_gradfun.c

…

vf_halfpack.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_harddup.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_hqdn3d.c

…

vf_hue.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_il.c

…

vf_ilpack.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_ivtc.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_kerndeint.c

…

vf_lavc.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_lavcdeint.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_mcdeint.c

…

vf_mirror.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_noformat.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_noise.c

…

vf_ow.c

…

vf_palette.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_perspective.c

…

vf_phase.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_pp7.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_pp.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_pullup.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_qp.c

…

vf_rectangle.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_remove_logo.c

Mark uninit() as static; it is only used within the file.

2010-02-14 11:09:58 +00:00

vf_rgb2bgr.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_rgbtest.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_rotate.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_sab.c

…

vf_scale.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_scale.h

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

vf_screenshot.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_smartblur.c

…

vf_softpulldown.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_softskip.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_spp.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_swapuv.c

…

vf_telecine.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_test.c

…

vf_tfields.c

Merge svn changes up to r30484

2010-03-09 19:24:47 +02:00

vf_tile.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_tinterlace.c

…

vf_unsharp.c

…

vf_uspp.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_vo.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_yadif.c

…

vf_yuvcsp.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_yuy2.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_yvu9.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf_zrmjpeg.c

…

vf.c

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vf.h

Merge svn changes up to r30463

2010-03-09 18:59:15 +02:00

vfcap.h

Add missing license headers to all files in the libmpcodecs directory.

2010-01-30 16:57:40 +00:00

vqf.h

…