[FFmpeg-cvslog] Merge commit 'f50803354c6acb4575379d7c54ca48ec5d36dd61'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 20 12:42:51 2013 +0200| [1e9a850df9b2d4824155cfa2513998875dc4823b] | committer: Michael Niedermayer

Merge commit 'f50803354c6acb4575379d7c54ca48ec5d36dd61'

* commit 'f50803354c6acb4575379d7c54ca48ec5d36dd61':
  asvdec: Verify the amount of extradata

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

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