Browse Source

Replace a few leftover instances of enum PixelFormat with enum AVPixelFormat

Signed-off-by: Martin Storsjö <martin@martin.st>
tags/n2.7
Martin Storsjö 10 years ago
parent
commit
58a840e215
2 changed files with 5 additions and 5 deletions
  1. +2
    -2
      libavcodec/libopenh264enc.c
  2. +3
    -3
      libavutil/imgutils.h

+ 2
- 2
libavcodec/libopenh264enc.c View File

@@ -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,
};

+ 3
- 3
libavutil/imgutils.h View File

@@ -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


Loading…
Cancel
Save