[FFmpeg-cvslog] Merge commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct  3 21:14:54 2013 +0200| [c2df95978b19d0d4b625c23a05f4bf78e8397d0b] | committer: Michael Niedermayer

Merge commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184'

* commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184':
  atrac3: Replace a silly counter variable name with plain 'j'

Conflicts:
	libavcodec/atrac3.c

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

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