[FFmpeg-cvslog] Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 16 13:13:42 2013 +0100| [bb29ee62e9ef30c26988f386e7c3be7affe836f9] | committer: Michael Niedermayer

Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'

* commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793':
  get_buffer(): do not initialize the data.

Conflicts:
	libavcodec/utils.c

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

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