[FFmpeg-cvslog] Merge commit '7a4f74eed51f914e9bbfebaffd4a92ac6791f819'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 29 15:22:49 2015 +0200| [07a79cf8694ac685ae8f579ccc33d113eb46fe3d] | committer: Michael Niedermayer

Merge commit '7a4f74eed51f914e9bbfebaffd4a92ac6791f819'

* commit '7a4f74eed51f914e9bbfebaffd4a92ac6791f819':
  h264: embed the DPB in the context

Conflicts:
	libavcodec/h264.c

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

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