[FFmpeg-cvslog] Merge commit 'bb95334c34d0d9abccea370ae25c4765d7764ab8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  1 14:32:22 2014 +0100| [7fa3ec88da8831b5d61fe7cca0f45d2d48e2e387] | committer: Michael Niedermayer

Merge commit 'bb95334c34d0d9abccea370ae25c4765d7764ab8'

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

Conflicts:
	tools/qt-faststart.c

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

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