[FFmpeg-cvslog] Merge commit 'f42485dbce614b3f63182845da43db690b427b7c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 17:13:24 2015 +0100| [55215383dc04365935c86f8a4db7b5396f1e3541] | committer: Michael Niedermayer

Merge commit 'f42485dbce614b3f63182845da43db690b427b7c'

* commit 'f42485dbce614b3f63182845da43db690b427b7c':
  h264: use a separate GetBitContext for slice data

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_parser.c
	libavcodec/h264_slice.c

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

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