[FFmpeg-cvslog] Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents

Diego Biurrun git at videolan.org
Tue Jul 30 12:10:35 CEST 2013


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Mon Jul 29 20:48:47 2013 +0200| [78b4bfdb84b7c909f7b97c87de17f59e36c50559] | committer: Diego Biurrun

Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78b4bfdb84b7c909f7b97c87de17f59e36c50559
---

 libavcodec/escape130.c |    2 +-
 libavcodec/g2meet.c    |    2 +-
 libavutil/pixdesc.c    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/escape130.c b/libavcodec/escape130.c
index 3e3f7e1..abba965 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 a617df6..199e8af 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 d5542a6..1614531 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",



More information about the ffmpeg-cvslog mailing list