diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-07-29 20:48:47 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-07-29 23:46:51 +0200 |
| commit | 78b4bfdb84b7c909f7b97c87de17f59e36c50559 (patch) | |
| tree | 1210fa274027f9c58820ec1e784b3296f19bc500 | |
| parent | 1f57d60129b0e297cd197c6031c4439b30a6b503 (diff) | |
| download | ffmpeg-78b4bfdb84b7c909f7b97c87de17f59e36c50559.tar.gz | |
Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents
| -rw-r--r-- | libavcodec/escape130.c | 2 | ||||
| -rw-r--r-- | libavcodec/g2meet.c | 2 | ||||
| -rw-r--r-- | libavutil/pixdesc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/escape130.c b/libavcodec/escape130.c index 3e3f7e1565..abba965096 100644 --- a/libavcodec/escape130.c +++ b/libavcodec/escape130.c @@ -115,7 +115,7 @@ const uint8_t chroma_vals[] = { static av_cold int escape130_decode_init(AVCodecContext *avctx) { Escape130Context *s = avctx->priv_data; - avctx->pix_fmt = PIX_FMT_YUV420P; + avctx->pix_fmt = AV_PIX_FMT_YUV420P; if ((avctx->width & 1) || (avctx->height & 1)) { av_log(avctx, AV_LOG_ERROR, diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index a617df61ff..199e8af080 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -835,7 +835,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/libavutil/pixdesc.c b/libavutil/pixdesc.c index d5542a61d8..1614531b91 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -231,7 +231,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .comp = { { 0, 0, 1, 0, 7 }, /* Y */ }, - .flags = PIX_FMT_PSEUDOPAL, + .flags = AV_PIX_FMT_FLAG_PSEUDOPAL, }, [AV_PIX_FMT_MONOWHITE] = { .name = "monow", |