From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 7 Mar 2014 23:20:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6eb08783a97821e731e249d70bbb39eefabbf17f;p=ffmpeg

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fic: Properly handle skip frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

6eb08783a97821e731e249d70bbb39eefabbf17f