[FFmpeg-cvslog] Merge commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 11 10:35:44 2013 +0200| [921c1d4c95a828167342095e77bbacfad25db686] | committer: Michael Niedermayer

Merge commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e'

* commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e':
  h264: check one context_init() allocation

Conflicts:
	libavcodec/h264.c

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

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