Merge commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:07:45 +0000 (12:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:07:49 +0000 (12:07 +0200)
* commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c':
  electronicarts: Remove bogus function documentation

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

Simple merge