[FFmpeg-cvslog] Merge commit '37e2d574ddcedc25e32bd963737b033354543789' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 23 03:15:51 2014 +0200| [5ac46a0969a3c86422794c838b681c75fda6b25e] | committer: Michael Niedermayer

Merge commit '37e2d574ddcedc25e32bd963737b033354543789' into release/2.2

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

Conflicts:
	libavfilter/setpts.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ac46a0969a3c86422794c838b681c75fda6b25e
---