Michael Niedermayer a8ff830b79 Merge commit '093804a93cc5da3f95f98265a5df116912443cec' ...

* commit '093804a93cc5da3f95f98265a5df116912443cec':
  avfilter: Add av_cold attributes to init/uninit functions

Conflicts:
	libavfilter/af_ashowinfo.c
	libavfilter/af_volume.c
	libavfilter/src_movie.c
	libavfilter/vf_lut.c

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

2013-05-05 11:42:18 +02:00

..

af_volume_init.c

Merge commit '093804a93cc5da3f95f98265a5df116912443cec'

2013-05-05 11:42:18 +02:00

af_volume.asm

…

Makefile

…

vf_gradfun.c

Merge remote-tracking branch 'qatar/master'

2013-04-23 11:01:46 +02:00

vf_hqdn3d_init.c

…

vf_hqdn3d.asm

…

vf_yadif_init.c

Merge remote-tracking branch 'qatar/master'

2013-04-23 11:01:46 +02:00

vf_yadif.asm

…

yadif-10.asm

…

yadif-16.asm

…