From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 11 Oct 2013 06:28:41 +0000 (+0200)
Subject: Merge commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020'
X-Git-Tag: android-x86-4.4-r1~670
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bb8ce36dc28576d2abd10afc171499d6a9ce656a;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020'

* commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020':
  shorten: Fix out-of-array read

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

bb8ce36dc28576d2abd10afc171499d6a9ce656a