[FFmpeg-cvslog] Merge commit '4cb9f1a77432de6f368df69bebbc082368a88c86'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 11 23:18:03 2014 +0100| [69b2d43d6afee6d8e11c09d74c6b5aa375304a1c] | committer: Michael Niedermayer

Merge commit '4cb9f1a77432de6f368df69bebbc082368a88c86'

* commit '4cb9f1a77432de6f368df69bebbc082368a88c86':
  h264_cabac: fix one fill_rectangle() indentation level

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

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