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)
* commit 'a90cff137b2aca89380b0acad41cd7bb05619ece':
  electronicarts: comment wording fixes

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

Simple merge