Merge commit 'a90cff137b2aca89380b0acad41cd7bb05619ece'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:08:38 +0000 (12:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:08:47 +0000 (12:08 +0200)
commit6bba6957858fe97bda8155dd8e6f857441410eed
treeb877d57ced0a06b28644d55f7fce8ea5184f454b
parent6a4e55a246369c007240fdd7732c2743ee740723
parenta90cff137b2aca89380b0acad41cd7bb05619ece
Merge commit 'a90cff137b2aca89380b0acad41cd7bb05619ece'

* commit 'a90cff137b2aca89380b0acad41cd7bb05619ece':
  electronicarts: comment wording fixes

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