diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-18 01:18:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-18 01:18:40 +0100 |
| commit | 0f16dfda50cb6b7b13e2a3f02f0823f67eeca748 (patch) | |
| tree | 7076e88c327db607dcee8e4b07f011d9222aeeef /libavcodec | |
| parent | 4fae55632236277865f736431bdf1dfaa0649116 (diff) | |
| download | ffmpeg-0f16dfda50cb6b7b13e2a3f02f0823f67eeca748.tar.gz | |
Replace PixelFormats which sneaked in over time or where forgotten by AVPixelFormats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/smvjpegdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/xfaceenc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index 375c9d91c3..5eca9bb6a2 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -50,7 +50,7 @@ static inline void smv_img_pnt_plane(uint8_t **dst, uint8_t *src, static inline void smv_img_pnt(uint8_t *dst_data[4], uint8_t *src_data[4], const int src_linesizes[4], - enum PixelFormat pix_fmt, int width, int height, + enum AVPixelFormat pix_fmt, int width, int height, int nlines) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); diff --git a/libavcodec/xfaceenc.c b/libavcodec/xfaceenc.c index 93abd467f4..fa6f22734b 100644 --- a/libavcodec/xfaceenc.c +++ b/libavcodec/xfaceenc.c @@ -237,5 +237,5 @@ AVCodec ff_xface_encoder = { .init = xface_encode_init, .close = xface_encode_close, .encode2 = xface_encode_frame, - .pix_fmts = (const enum PixelFormat[]) { AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, }; |