Merge commit 'a6a2d8eb8f125a2edb512a7a47df33dbd70d6b35' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Mar 2014 21:39:08 +0000 (22:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Mar 2014 21:42:25 +0000 (22:42 +0100)
commit7ff4cd2acc8cdea09b0738bed35942805fe9b2e8
treeec72b8e0c06b9f0298256338768650e96e2a49f8
parentc4149c4d54060802f452404f512182d4ec2fb3ec
parenta6a2d8eb8f125a2edb512a7a47df33dbd70d6b35
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@gmx.at>
tools/qt-faststart.c