[FFmpeg-cvslog] Merge commit 'cb95c1935f43ee6ae7fd15439df0f674e809f180' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 13:32:22 2014 +0200| [c40631baf77f173ef722e715ced2f8d81241eb9a] | committer: Michael Niedermayer

Merge commit 'cb95c1935f43ee6ae7fd15439df0f674e809f180' into release/1.1

* commit 'cb95c1935f43ee6ae7fd15439df0f674e809f180':
  qt-faststart: Check offset_count before reading from the moov_atom buffer

Conflicts:
	tools/qt-faststart.c

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

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