From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Date: Sun, 8 May 2016 22:04:47 +0000 (+0100)
Subject: Merge commit '1db8eb154908cde577477b6ab17430a0cd46b7bd'
X-Git-Tag: android-x86-7.1-r1~5309
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9109b5240b5e93abee0957dd5b054057e556c571;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '1db8eb154908cde577477b6ab17430a0cd46b7bd'

* commit '1db8eb154908cde577477b6ab17430a0cd46b7bd':
  avconv: Drop an unused variable

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---

9109b5240b5e93abee0957dd5b054057e556c571