[FFmpeg-cvslog] Merge commit 'a6a2d8eb8f125a2edb512a7a47df33dbd70d6b35' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  3 22:39:08 2014 +0100| [7ff4cd2acc8cdea09b0738bed35942805fe9b2e8] | committer: Michael Niedermayer

Merge commit 'a6a2d8eb8f125a2edb512a7a47df33dbd70d6b35' into release/2.2

* commit 'a6a2d8eb8f125a2edb512a7a47df33dbd70d6b35':
  qt-faststart: Add a note about the -movflags +faststart feature
  qt-faststart: Avoid unintentionally sign extending BE_32
  qt-faststart: Check offset_count before reading from the moov_atom buffer
  qt-faststart: Check the ftello() return codes
  qt-faststart: Fix the signedness of variables keeping the ftello return values
  qt-faststart: Check fseeko() return codes
  qt-faststart: Simplify code by using a MIN() macro
  qt-faststart: Increase the copy buffer size to 64 KB

Conflicts:
	tools/qt-faststart.c

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

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