Merge commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Oct 2013 06:28:41 +0000 (08:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Oct 2013 07:20:26 +0000 (09:20 +0200)
* commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020':
  shorten: Fix out-of-array read

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/shorten.c

Simple merge