diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 13:54:35 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 13:55:16 +0100 |
commit | 11c4bc9a744b16b5c297b7d302c9abac1b34b689 (patch) | |
tree | 2ae7103601f115ef8287c2d465d9260d0569e515 /libavformat/segment.c | |
parent | 0bb474f686fb33ef731e34972e48b82dfbf82984 (diff) | |
parent | 5612244351b2eb3cb4e6225861a0f55aa5d0c475 (diff) | |
download | ffmpeg-11c4bc9a744b16b5c297b7d302c9abac1b34b689.tar.gz |
Merge commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475'
* commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475':
qt-faststart: Check fseeko() return codes
Conflicts:
tools/qt-faststart.c
See: 0de41ead6f9034e0a834abe51028a02aee094990
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/segment.c')
0 files changed, 0 insertions, 0 deletions