Merge commit '018bdaed37d2f1735dbecfc58309a1a164abadd5'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:56:32 +0000 (14:56 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:56:53 +0000 (14:56 +0100)
commitef636aacf54ece8d596fa84f4d66beb2ab814080
treec4ba19aebbdd91f2ead59f6e143281f134ec5e8d
parent3ce3973e5c2659e122465ec2e5a2debc8272c14d
parent018bdaed37d2f1735dbecfc58309a1a164abadd5
Merge commit '018bdaed37d2f1735dbecfc58309a1a164abadd5'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavfilter/setpts.c