virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

replace some deprecated defines

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-07-06 05:37:31 +00:00
parent 9635806265
commit d64f3b72e0
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/g2meet.c
View File

@ -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;
}

2
libavcodec/sgirledec.c
View File

@ -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))

2
libavcodec/smvjpegdec.c
View File

@ -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++)

2
libavfilter/vf_vignette.c
View File

@ -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;

18
libavformat/avisynth.c
View File

@ -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: