diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-07-06 05:37:31 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-07-06 05:43:24 +0000 |
| commit | d64f3b72e0eaec2933b5283b676272c678b28e79 (patch) | |
| tree | 76065cb924ab660e2184e8cbe9b066d258702cdb /libavcodec | |
| parent | 96358062650addef5a01fe8333aa3e8d86e1dfd7 (diff) | |
replace some deprecated defines
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/g2meet.c | 2 | ||||
| -rw-r--r-- | libavcodec/sgirledec.c | 2 | ||||
| -rw-r--r-- | libavcodec/smvjpegdec.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 09ed7ce7c4..bc01dfafc8 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -840,7 +840,7 @@ static av_cold int g2m_decode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); } - avctx->pix_fmt = PIX_FMT_RGB24; + avctx->pix_fmt = AV_PIX_FMT_RGB24; return 0; } diff --git a/libavcodec/sgirledec.c b/libavcodec/sgirledec.c index a7fdac82b8..af149d14e9 100644 --- a/libavcodec/sgirledec.c +++ b/libavcodec/sgirledec.c @@ -42,7 +42,7 @@ static av_cold int sgirle_decode_init(AVCodecContext *avctx) } /** - * Convert SGI RGB332 pixel into PIX_FMT_BGR8 + * Convert SGI RGB332 pixel into AV_PIX_FMT_BGR8 * SGI RGB332 is packed RGB 3:3:2, 8bpp, (msb)3R 2B 3G(lsb) */ #define RGB332_TO_BGR8(x) (((x << 3) & 0xC0) | ((x << 3) & 0x38) | ((x >> 5) & 7)) diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index d7178d77c3..7d848394fb 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -56,7 +56,7 @@ static inline void smv_img_pnt(uint8_t *dst_data[4], uint8_t *src_data[4], const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); int i, planes_nb = 0; - if (desc->flags & PIX_FMT_HWACCEL) + if (desc->flags & AV_PIX_FMT_FLAG_HWACCEL) return; for (i = 0; i < desc->nb_components; i++) |