Michael Niedermayer 55dc253c24 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: e6674e46ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2015-01-15 05:07:25 +01:00

8.1 KiB

Raw Blame History

View Raw