diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 00:57:07 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 00:59:44 +0200 |
commit | 9e1cdfb89be553b8d21239a7eeaa0d1bc0cbbf5a (patch) | |
tree | 86be45184a2c6684c5343fc48147c44ce70aab13 /libavcodec/ffv1dec.c | |
parent | ebab902a1c3670c1e445d144f1d4365f32955a85 (diff) | |
parent | 5c720657c23afd798ae0db7c7362eb859a89ab3d (diff) | |
download | ffmpeg-9e1cdfb89be553b8d21239a7eeaa0d1bc0cbbf5a.tar.gz |
Merge commit '5c720657c23afd798ae0db7c7362eb859a89ab3d'
* commit '5c720657c23afd798ae0db7c7362eb859a89ab3d':
mov: always check avio_read return value
Conflicts:
libavformat/mov.c
See: b71528d8967c1e10f499432fe26ff4713d1fd3b6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1dec.c')
0 files changed, 0 insertions, 0 deletions