Merge commit '7d12cba95ca15198a930c05458dc414ac00c578b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:58:33 +0000 (14:58 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:58:33 +0000 (14:58 +0100)
commit1cb78a0dcfd05fb11a1237aa532868b4ce6eebb4
treebe04ea5e9e89ac7647eeef3d49ecd6a08a3330a1
parentb2a8c8538d597d7b16998ff58ee57295a84dece9
parent7d12cba95ca15198a930c05458dc414ac00c578b
Merge commit '7d12cba95ca15198a930c05458dc414ac00c578b'

* commit '7d12cba95ca15198a930c05458dc414ac00c578b':
  vf_framepack: Check and update frame_rate

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