Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Oct 2013 08:44:42 +0000 (10:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Oct 2013 08:44:42 +0000 (10:44 +0200)
commitcaac12bd49844c776e1acda2908df198998cea63
treea8c43b30b7ee4e8d20352ee8ac7cd0b19a242c64
parent1ea28ffc4dbcdda64dc2e774c186f668ef7b030f
parentfb13fe8342faff6f7ca9c747aff5d7cf7c5202c6
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  golomb: reduce scope of a few variables

Conflicts:
libavcodec/golomb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/golomb.h