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)
commit6a4e55a246369c007240fdd7732c2743ee740723
tree4ccade3d813b2863f12bd4f5b2be96bf84c24416
parenta87cf3689ef2a1a53a022d664f3687d506ab08b1
parent288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c
Merge commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c'

* commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c':
  electronicarts: Remove bogus function documentation

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