libavfilter/af_asyncts.c · 67fad0d221458d43edb9037c30171d0adb1d609a · Samuel Mira / ffmpeg

11 years ago

Michael Niedermayer authored 11 years ago


* commit '093804a9':
  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>

a8ff830b

History

Merge commit ''

Michael Niedermayer authored 11 years ago


* commit '093804a9':
  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>

af_asyncts.c 10.30 KiB