Merge commit '593aaee953f8b07c141ff115e67bae85ef0350c7'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Aug 2014 19:47:43 +0000 (21:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Aug 2014 19:47:43 +0000 (21:47 +0200)
commit2bfd4ff16dddc46d30b9e3510cb31e3b1b1b90fe
tree0d5cf2ee61c86b14375481cc46efd72fc9da6ce6
parent4f49c39a2fec85435fd0aabd5a402d9fa11b2fea
parent593aaee953f8b07c141ff115e67bae85ef0350c7
Merge commit '593aaee953f8b07c141ff115e67bae85ef0350c7'

* commit '593aaee953f8b07c141ff115e67bae85ef0350c7':
  setpts: Add missing inttypes.h #include for PRId64

Conflicts:
libavfilter/setpts.c

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