diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 13:32:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 13:32:22 +0200 |
| commit | c40631baf77f173ef722e715ced2f8d81241eb9a (patch) | |
| tree | fc56e8f07f9ea2f29503ee0072b2716d81b9d16e /doc/examples/decoding_encoding.c | |
| parent | c6f2ad9f944d07379072553a310bedc94cd2e74f (diff) | |
| parent | cb95c1935f43ee6ae7fd15439df0f674e809f180 (diff) | |
| download | ffmpeg-c40631baf77f173ef722e715ced2f8d81241eb9a.tar.gz | |
Merge commit 'cb95c1935f43ee6ae7fd15439df0f674e809f180' into release/1.1
* 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>
Diffstat (limited to 'doc/examples/decoding_encoding.c')
0 files changed, 0 insertions, 0 deletions