From 58a840e21577a2168843487a98cb2cea44b5a94a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 17 Mar 2015 14:40:40 +0200 Subject: [PATCH] Replace a few leftover instances of enum PixelFormat with enum AVPixelFormat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavcodec/libopenh264enc.c | 4 ++-- libavutil/imgutils.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index e3f9a95d24..35431fa361 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -228,7 +228,7 @@ AVCodec ff_libopenh264_encoder = { .encode2 = svc_encode_frame, .close = svc_encode_close, .capabilities = CODEC_CAP_AUTO_THREADS, - .pix_fmts = (const enum PixelFormat[]){ AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE }, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE }, .priv_class = &class, }; diff --git a/libavutil/imgutils.h b/libavutil/imgutils.h index efb4eb2494..04d6138f67 100644 --- a/libavutil/imgutils.h +++ b/libavutil/imgutils.h @@ -145,7 +145,7 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4], */ int av_image_fill_arrays(uint8_t *dst_data[4], int dst_linesize[4], const uint8_t *src, - enum PixelFormat pix_fmt, int width, int height, int align); + enum AVPixelFormat pix_fmt, int width, int height, int align); /** * Return the size in bytes of the amount of data required to store an @@ -153,7 +153,7 @@ int av_image_fill_arrays(uint8_t *dst_data[4], int dst_linesize[4], * * @param[in] align the assumed linesize alignment */ -int av_image_get_buffer_size(enum PixelFormat pix_fmt, int width, int height, int align); +int av_image_get_buffer_size(enum AVPixelFormat pix_fmt, int width, int height, int align); /** * Copy image data from an image into a buffer. @@ -174,7 +174,7 @@ int av_image_get_buffer_size(enum PixelFormat pix_fmt, int width, int height, in */ int av_image_copy_to_buffer(uint8_t *dst, int dst_size, const uint8_t * const src_data[4], const int src_linesize[4], - enum PixelFormat pix_fmt, int width, int height, int align); + enum AVPixelFormat pix_fmt, int width, int height, int align); /** * Check if the given dimension of an image is valid, meaning that all