diff options
| -rw-r--r-- | libavcodec/g2meet.c | 2 | ||||
| -rw-r--r-- | libavcodec/sgirledec.c | 2 | ||||
| -rw-r--r-- | libavcodec/smvjpegdec.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_vignette.c | 2 | ||||
| -rw-r--r-- | libavformat/avisynth.c | 18 |
5 files changed, 13 insertions, 13 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 09ed7ce..bc01dfa 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 a7fdac8..af149d1 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 d7178d7..7d84839 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++) diff --git a/libavfilter/vf_vignette.c b/libavfilter/vf_vignette.c index ef31799..1819993 100644 --- a/libavfilter/vf_vignette.c +++ b/libavfilter/vf_vignette.c @@ -213,7 +213,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) if (s->eval_mode == EVAL_MODE_FRAME) update_context(s, inlink, in); - if (s->desc->flags & PIX_FMT_RGB) { + if (s->desc->flags & AV_PIX_FMT_FLAG_RGB) { uint8_t *dst = out->data[0]; const uint8_t *src = in ->data[0]; const float *fmap = s->fmap; diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 35b66f1..ef54b9b 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -239,37 +239,37 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) { switch (avs->vi->pixel_type) { #ifdef _WIN32 case AVS_CS_YV24: - st->codec->pix_fmt = PIX_FMT_YUV444P; + st->codec->pix_fmt = AV_PIX_FMT_YUV444P; planar = 1; break; case AVS_CS_YV16: - st->codec->pix_fmt = PIX_FMT_YUV422P; + st->codec->pix_fmt = AV_PIX_FMT_YUV422P; planar = 1; break; case AVS_CS_YV411: - st->codec->pix_fmt = PIX_FMT_YUV411P; + st->codec->pix_fmt = AV_PIX_FMT_YUV411P; planar = 1; break; case AVS_CS_Y8: - st->codec->pix_fmt = PIX_FMT_GRAY8; + st->codec->pix_fmt = AV_PIX_FMT_GRAY8; planar = 2; break; #endif case AVS_CS_BGR24: - st->codec->pix_fmt = PIX_FMT_BGR24; + st->codec->pix_fmt = AV_PIX_FMT_BGR24; break; case AVS_CS_BGR32: - st->codec->pix_fmt = PIX_FMT_RGB32; + st->codec->pix_fmt = AV_PIX_FMT_RGB32; break; case AVS_CS_YUY2: - st->codec->pix_fmt = PIX_FMT_YUYV422; + st->codec->pix_fmt = AV_PIX_FMT_YUYV422; break; case AVS_CS_YV12: - st->codec->pix_fmt = PIX_FMT_YUV420P; + st->codec->pix_fmt = AV_PIX_FMT_YUV420P; planar = 1; break; case AVS_CS_I420: // Is this even used anywhere? - st->codec->pix_fmt = PIX_FMT_YUV420P; + st->codec->pix_fmt = AV_PIX_FMT_YUV420P; planar = 1; break; default: |
