Merge commit '92e0b7342c0490894cbcea4461380321e0569de2'

[ffmpeg] / libavcodec / smvjpegdec.c

diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c
index 375c9d91c3ccf4a3abe509eedde6f2ea4ac081de..5eca9bb6a2679808194134eba29fb26d4a7f2aef 100644 (file)
--- 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);