diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 10:50:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 11:10:09 +0200 |
| commit | ff4680922fc4f1295081da45173e9a71d141a045 (patch) | |
| tree | f30f162527bfc053e0bf5139289e83311cb16e10 /libavcodec | |
| parent | 75835abe910f686cc8dda1fc1ac147f412ecdeda (diff) | |
| parent | e6c4ac7b5f038be56dfbb0171f5dd0cb850d9b28 (diff) | |
| download | ffmpeg-ff4680922fc4f1295081da45173e9a71d141a045.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
Conflicts:
doc/APIchanges
libavcodec/avpicture.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/tiffenc.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavutil/imgutils.c
libavutil/pixdesc.c
libavutil/version.h
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/imgconvert.c | 6 | ||||
| -rw-r--r-- | libavcodec/pnm.c | 2 | ||||
| -rw-r--r-- | libavcodec/rawdec.c | 6 | ||||
| -rw-r--r-- | libavcodec/utils.c | 4 | ||||
| -rw-r--r-- | libavcodec/xwdenc.c | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index db52455c9f..6312ec93e8 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -77,7 +77,7 @@ static int get_color_type(const AVPixFmtDescriptor *desc) { if(desc->name && !strncmp(desc->name, "yuvj", 4)) return FF_COLOR_YUV_JPEG; - if(desc->flags & PIX_FMT_RGB) + if(desc->flags & AV_PIX_FMT_FLAG_RGB) return FF_COLOR_RGB; if(desc->nb_components == 0) @@ -366,8 +366,8 @@ static inline int is_yuv_planar(const AVPixFmtDescriptor *desc) int i; int planes[4] = { 0 }; - if ( desc->flags & PIX_FMT_RGB - || !(desc->flags & PIX_FMT_PLANAR)) + if ( desc->flags & AV_PIX_FMT_FLAG_RGB + || !(desc->flags & AV_PIX_FMT_FLAG_PLANAR)) return 0; /* set the used planes */ diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index 33b8896555..308457bbe9 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -181,7 +181,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) }else s->maxval=1; /* more check if YUV420 */ - if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & PIX_FMT_PLANAR) { + if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR) { if ((avctx->width & 1) != 0) return AVERROR_INVALIDDATA; h = (avctx->height * 2); diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index f45ff4c3fa..46992427be 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -123,11 +123,11 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) return AVERROR(EINVAL); } - if (desc->flags & (PIX_FMT_PAL | PIX_FMT_PSEUDOPAL)) { + if (desc->flags & (AV_PIX_FMT_FLAG_PAL | AV_PIX_FMT_FLAG_PSEUDOPAL)) { context->palette = av_buffer_alloc(AVPALETTE_SIZE); if (!context->palette) return AVERROR(ENOMEM); - if (desc->flags & PIX_FMT_PSEUDOPAL) + if (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) avpriv_set_systematic_pal2((uint32_t*)context->palette->data, avctx->pix_fmt); else memset(context->palette->data, 0, AVPALETTE_SIZE); @@ -276,7 +276,7 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame, } if ((avctx->pix_fmt == AV_PIX_FMT_PAL8 && buf_size < context->frame_size) || - (desc->flags & PIX_FMT_PSEUDOPAL)) { + (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)) { frame->buf[1] = av_buffer_ref(context->palette); if (!frame->buf[1]) { av_buffer_unref(&frame->buf[0]); diff --git a/libavcodec/utils.c b/libavcodec/utils.c index fa375ac9ce..0f6496d208 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -762,7 +762,7 @@ do { \ planes = av_pix_fmt_count_planes(frame->format); /* workaround for AVHWAccel plane count of 0, buf[0] is used as check for allocated buffers: make libavcodec happy */ - if (desc && desc->flags & PIX_FMT_HWACCEL) + if (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL) planes = 1; if (!desc || planes <= 0) { ret = AVERROR(EINVAL); @@ -919,7 +919,7 @@ int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, static int is_hwaccel_pix_fmt(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); - return desc->flags & PIX_FMT_HWACCEL; + return desc->flags & AV_PIX_FMT_FLAG_HWACCEL; } enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat *fmt) diff --git a/libavcodec/xwdenc.c b/libavcodec/xwdenc.c index 9d0da29d0f..e98de5e829 100644 --- a/libavcodec/xwdenc.c +++ b/libavcodec/xwdenc.c @@ -43,7 +43,7 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, AVFrame * const p = (AVFrame *)pict; pixdepth = av_get_bits_per_pixel(desc); - if (desc->flags & PIX_FMT_BE) + if (desc->flags & AV_PIX_FMT_FLAG_BE) be = 1; switch (pix_fmt) { case AV_PIX_FMT_ARGB: |