Merge commit 'bb95334c34d0d9abccea370ae25c4765d7764ab8'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 13:32:22 +0000 (14:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 13:33:45 +0000 (14:33 +0100)
* 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@gmx.at>
1  2 
tools/qt-faststart.c

Simple merge