ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Aug 21
21:47:43 2014 +0200| [2bfd4ff16dddc46d30b9e3510cb31e3b1b1b90fe] | committer:
Michael Niedermayer
Merge commit '593aaee953f8b07c141ff115e67bae85ef0350c7'
* commit '593aaee953f8b07c141ff115e67bae85ef0350c7':
setpts: Add missing inttypes.h #include for PRId64
Conflicts:
libavfilter/setpts.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2bfd4ff16dddc46d30b9e3510cb31e3b1b1b90fe
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
