[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 24 10:44:42 2013 +0200| [caac12bd49844c776e1acda2908df198998cea63] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

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

Conflicts:
	libavcodec/golomb.h

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

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