[FFmpeg-cvslog] Merge commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 16 12:14:32 2013 +0200| [4195321a82c9db6111f9b5e0b755263f37a734e9] | committer: Michael Niedermayer

Merge commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529'

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

Conflicts:
	libavformat/electronicarts.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4195321a82c9db6111f9b5e0b755263f37a734e9
---