[FFmpeg-cvslog] Merge commit 'fa4604d80580dde45bfce32ebe04a5c13c233895' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  9 12:23:49 2015 +0100| [e3654b25cfba87b5a2cfb821282c35602b48a337] | committer: Michael Niedermayer

Merge commit 'fa4604d80580dde45bfce32ebe04a5c13c233895' into release/2.2

* commit 'fa4604d80580dde45bfce32ebe04a5c13c233895':
  h264: Do not share rbsp_buffer across threads

Conflicts:
	libavcodec/h264.c

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

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