Merge commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Oct 2013 19:14:54 +0000 (21:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Oct 2013 19:14:54 +0000 (21:14 +0200)
commitc2df95978b19d0d4b625c23a05f4bf78e8397d0b
tree43fdb793543f9350bf1c7e2f2da23ab35576deed
parent6565b1ad97fe166891dd0bb6652b78216dc2d039
parentbe0b4c70ec40d7f9ac8e416a4379d4a387421184
Merge commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184'

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

Conflicts:
libavcodec/atrac3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/atrac3.c