Merge commit '5c720657c23afd798ae0db7c7362eb859a89ab3d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 22:57:07 +0000 (00:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 22:59:44 +0000 (00:59 +0200)
commit9e1cdfb89be553b8d21239a7eeaa0d1bc0cbbf5a
tree86be45184a2c6684c5343fc48147c44ce70aab13
parentebab902a1c3670c1e445d144f1d4365f32955a85
parent5c720657c23afd798ae0db7c7362eb859a89ab3d
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>
libavformat/mov.c