# HG changeset patch # User michael # Date 1065860285 0 # Node ID 5a43bc31c2ebd8612980b10c30176863f117ce50 # Parent f4cf270b98aef90200e255b08e31264df8f65605 recommit of promote avpicture_alloc to public interface patch by (Drew Hess ) diff -r f4cf270b98ae -r 5a43bc31c2eb avcodec.h --- a/avcodec.h Sat Oct 11 01:41:41 2003 +0000 +++ b/avcodec.h Sat Oct 11 08:18:05 2003 +0000 @@ -1524,6 +1524,20 @@ void img_resample_close(ImgReSampleContext *s); +/** + * Allocate memory for a picture. Call avpicture_free to free it. + * + * @param picture the picture to be filled in. + * @param pix_fmt the format of the picture. + * @param width the width of the picture. + * @param height the height of the picture. + * @return 0 if successful, -1 if not. + */ +int avpicture_alloc(AVPicture *picture, int pix_fmt, int width, int height); + +/* Free a picture previously allocated by avpicture_alloc. */ +void avpicture_free(AVPicture *picture); + int avpicture_fill(AVPicture *picture, uint8_t *ptr, int pix_fmt, int width, int height); int avpicture_layout(const AVPicture* src, int pix_fmt, int width, int height, diff -r f4cf270b98ae -r 5a43bc31c2eb imgconvert.c --- a/imgconvert.c Sat Oct 11 01:41:41 2003 +0000 +++ b/imgconvert.c Sat Oct 11 08:18:05 2003 +0000 @@ -1613,7 +1613,7 @@ }, }; -static int avpicture_alloc(AVPicture *picture, +int avpicture_alloc(AVPicture *picture, int pix_fmt, int width, int height) { unsigned int size; @@ -1630,7 +1630,7 @@ return -1; } -static void avpicture_free(AVPicture *picture) +void avpicture_free(AVPicture *picture) { av_free(picture->data[0]); }