* commit '37e2d574':
  setpts: Add missing inttypes.h #include for PRId64

Conflicts:
	libavfilter/setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>