Merge commit 'a7b87ca9111bafb220ab94d53ab4e4ed48111800'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Nov 2013 10:57:49 +0000 (11:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Nov 2013 10:59:06 +0000 (11:59 +0100)
* commit 'a7b87ca9111bafb220ab94d53ab4e4ed48111800':
  libxavs: rename and fix a variable name

Conflicts:
libavcodec/libxavs.c

See: 260fc0d95b025b03b2a15116526e4c83b1ca1a31
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge