From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 9 Mar 2014 00:50:11 +0000 (+0100)
Subject: Merge commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c'
X-Git-Tag: android-x86-6.0-r1~6816
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9827f3db88c0dbcca3070dbd88af131dbcc7e84c;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c'

* commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c':
  movenc: allow override of "writing application" tag

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

9827f3db88c0dbcca3070dbd88af131dbcc7e84c