Michael Niedermayer ac8987591f Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' ...

* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
  Drop DCTELEM typedef

Conflicts:
	libavcodec/alpha/dsputil_alpha.h
	libavcodec/alpha/motion_est_alpha.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/bfin/dsputil_bfin.h
	libavcodec/bfin/pixels_bfin.S
	libavcodec/cavs.c
	libavcodec/cavsdec.c
	libavcodec/dct-test.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/dsputil_template.c
	libavcodec/eamad.c
	libavcodec/h264_cavlc.c
	libavcodec/h264idct_template.c
	libavcodec/mpeg12.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/ppc/dsputil_altivec.c
	libavcodec/proresdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-01-23 17:44:56 +01:00

..

libvo

…

cpudetect.h

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

help_mp.h

…

img_format.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

img_format.h

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

mp_image.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

mp_image.h

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

mp_msg.h

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

mpbswap.h

…

mpc_info.h

…

pullup.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

pullup.h

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vd_ffmpeg.h

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_detc.c

vf_detc: dont mix av_strdup & free

2012-12-28 17:04:54 +01:00

vf_dint.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_divtc.c

vf_divtc: dont mix av_strdup and free

2012-12-28 17:05:19 +01:00

vf_down3dright.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_dsize.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_eq2.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_eq.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_fil.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_filmdint.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_fspp.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

vf_harddup.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_il.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_ilpack.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_ivtc.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_kerndeint.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_mcdeint.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_noise.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_ow.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_perspective.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_phase.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_pp7.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

vf_pullup.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_qp.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_sab.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_scale.h

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_softpulldown.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_softskip.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_spp.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

vf_stereo3d.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_telecine.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_tinterlace.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_unsharp.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf_uspp.c

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vf.h

lavfi/mp: add ff_ prefix to exported symbols

2012-12-06 12:38:37 +01:00

vfcap.h

…