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)
* commit '7d12cba95ca15198a930c05458dc414ac00c578b':
  vf_framepack: Check and update frame_rate

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

Simple merge