[FFmpeg-cvslog] Merge commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 12 13:30:44 2013 +0200| [a44d35d90ffa0cfc3eb8a8a8fc6c20ffec4e90fe] | committer: Michael Niedermayer

Merge commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b'

* commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b':
  shorten: Use a checked bytestream reader for the wave header

Conflicts:
	libavcodec/shorten.c

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

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