[FFmpeg-cvslog] Merge commit '342c43d154e586bc022c86b168fe8d36f69da9d3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 16 12:05:42 2013 +0200| [a444ddff03861b092558aa0b1b38b218fc636aaa] | committer: Michael Niedermayer

Merge commit '342c43d154e586bc022c86b168fe8d36f69da9d3'

* commit '342c43d154e586bc022c86b168fe8d36f69da9d3':
  omadec: Properly check lengths before incrementing the position

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a444ddff03861b092558aa0b1b38b218fc636aaa
---