Merge commit '48ff6683ba5d40b629428673b1028e8ec542a9fa'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:45:24 +0000 (14:45 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:47:29 +0000 (14:47 +0100)
commit0b73d0ff0df7135332ef77e78b619b0822d248a8
tree416ba3e466c541f11712af6d09dc959363ae00cb
parentb33d58c31f210d6409a54f3adb6e9a3d0c1642f6
parent48ff6683ba5d40b629428673b1028e8ec542a9fa
Merge commit '48ff6683ba5d40b629428673b1028e8ec542a9fa'

* commit '48ff6683ba5d40b629428673b1028e8ec542a9fa':
  lavfi: add a frame_rate field to AVFilterLink.

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