From: James Almer <jamrial@gmail.com>
Date: Wed, 28 Sep 2016 15:57:58 +0000 (-0300)
Subject: Merge commit '5fa255b65c7887cc913f097aed1b581fbf1a8745'
X-Git-Tag: android-x86-7.1-r1~3673
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=df2ae8f3f0a8ce9d9aefa5efb664928a783759ec;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '5fa255b65c7887cc913f097aed1b581fbf1a8745'

* commit '5fa255b65c7887cc913f097aed1b581fbf1a8745':
  avconv: initialize output framerate earlier

Skipping this for now. It's not needed until several committs ahead,
and should be carefully implemented.

Merged-by: James Almer <jamrial@gmail.com>
---

df2ae8f3f0a8ce9d9aefa5efb664928a783759ec