[FFmpeg-cvslog] Merge commit 'e2ad0b66fa273c5c823978e8f601f2c0d9ee42f8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 15 04:56:32 2015 +0100| [55dc253c24f2160ede1db4f04cfe0692b0b80d05] | committer: Michael Niedermayer

Merge commit 'e2ad0b66fa273c5c823978e8f601f2c0d9ee42f8'

* commit 'e2ad0b66fa273c5c823978e8f601f2c0d9ee42f8':
  imgutils: create misc functions for dealing with buffers

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/avpicture.c
	libavutil/imgutils.c
	libavutil/imgutils.h
	libavutil/version.h

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

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