[FFmpeg-cvslog] Merge commit '018bdaed37d2f1735dbecfc58309a1a164abadd5'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Nov 11 14:56:32 2015 +0100| [ef636aacf54ece8d596fa84f4d66beb2ab814080] | committer: Hendrik Leppkes

Merge commit '018bdaed37d2f1735dbecfc58309a1a164abadd5'

* commit '018bdaed37d2f1735dbecfc58309a1a164abadd5':
  setpts: add FRAME_RATE constant

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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