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)
commitbb8ce36dc28576d2abd10afc171499d6a9ce656a
tree6903e716edcfbaf06c7b6bc42b51e655c70e1116
parent964f9ca2299431def0b3a3d57ddee5c0d4793e91
parent5f5ada3dbf97e306a74250ba8dcf8619ad59b020
Merge commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020'

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

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