diff options
| author | Martin Storsjö <martin@martin.st> | 2015-03-17 14:40:40 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2015-03-17 23:53:33 +0200 |
| commit | 58a840e21577a2168843487a98cb2cea44b5a94a (patch) | |
| tree | cc47b548f71eec6c2d454d7c19dae48b43258863 | |
| parent | 6289706b35d1b030258bba54cc27bb6d2c04bc9b (diff) | |
| download | ffmpeg-58a840e21577a2168843487a98cb2cea44b5a94a.tar.gz | |
Replace a few leftover instances of enum PixelFormat with enum AVPixelFormat
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/libopenh264enc.c | 4 | ||||
| -rw-r--r-- | 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 |