Commit 9e1cdfb8 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '5c720657'

* commit '5c720657':
  mov: always check avio_read return value

Conflicts:
	libavformat/mov.c

See: b71528d8Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ebab902a 5c720657
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment