[FFmpeg-cvslog] Merge commit '7d12cba95ca15198a930c05458dc414ac00c578b'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Nov 11 14:58:33 2015 +0100| [1cb78a0dcfd05fb11a1237aa532868b4ce6eebb4] | committer: Hendrik Leppkes

Merge commit '7d12cba95ca15198a930c05458dc414ac00c578b'

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

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

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