Merge commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:14:32 +0000 (12:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:14:32 +0000 (12:14 +0200)
commit4195321a82c9db6111f9b5e0b755263f37a734e9
tree544a46c9fe4a0725080e3e361037403b877ed04d
parent6bba6957858fe97bda8155dd8e6f857441410eed
parent4908c8ef2706d98022bf27a5c5bca1fe109e7529
Merge commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529'

* commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529':
  electronicarts: Improve some function/variable names

Conflicts:
libavformat/electronicarts.c

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