Merge commit 'cb95c1935f43ee6ae7fd15439df0f674e809f180' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 11:32:22 +0000 (13:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 11:32:22 +0000 (13:32 +0200)
* commit 'cb95c1935f43ee6ae7fd15439df0f674e809f180':
  qt-faststart: Check offset_count before reading from the moov_atom buffer

Conflicts:
tools/qt-faststart.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tools/qt-faststart.c

Simple merge