Merge commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Aug 2014 17:01:26 +0000 (19:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Aug 2014 17:01:26 +0000 (19:01 +0200)
commit350dd8534575e89a8ed5f2bdafc24651a82338e5
tree5c7b5cb2cb9731692dfc64552fe0ec109aa5623e
parente356f6c55d46bf3e58005c4e55b2226834a2c22a
parent4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b
Merge commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b'

* commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b':
  electronicarts: do not fail on zero-sized chunks

Conflicts:
libavformat/electronicarts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/electronicarts.c