[FFmpeg-cvslog] Merge commit '0ab76ddf313eeab70d06619ae0376fd7dd40761b' into release/0.10

Tue Aug 12 20:00:23 CEST 2014

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 12 19:23:34 2014 +0200| [bb015b519e29a125b794bf1a5e18c422bcb4090c] | committer: Michael Niedermayer

Merge commit '0ab76ddf313eeab70d06619ae0376fd7dd40761b' into release/0.10

* commit '0ab76ddf313eeab70d06619ae0376fd7dd40761b':
  avcodec: Introduce ff_get_buffer

Conflicts:
	libavcodec/8svx.c
	libavcodec/dpcm.c
	libavcodec/utils.c
	libavcodec/vmdav.c
	libavcodec/yop.c

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

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