[FFmpeg-cvslog] Merge commit '5569146d48f06564e8fa393424782cceed510916'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  4 00:50:19 2014 +0100| [c13e73c25b6d548c6982cfe267b3925dad4f253e] | committer: Michael Niedermayer

Merge commit '5569146d48f06564e8fa393424782cceed510916'

* commit '5569146d48f06564e8fa393424782cceed510916':
  adx: check that the offset is not negative

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

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