[FFmpeg-cvslog] Merge commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep  5 19:08:27 2014 +0200| [8c6cfffa01b27afde8bb983c6421611e07688aa6] | committer: Michael Niedermayer

Merge commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611'

* commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611':
  get_bits: Add OPEN_READER macro variant w/o size_plus8

Conflicts:
	libavcodec/get_bits.h

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

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