# HG changeset patch # User stefano # Date 1274483990 0 # Node ID 4c894b7169485c86ebf05755b3fe726267539637 # Parent 3ba304b8cbd2d5f3d01a35ec59d8c0bb1537e04f Rename pixelFormatBpsAVI to pix_fmt_bps_avi and pixelFormatBpsMOV to pix_fmt_bps_mov. The new names are consistent with the predominant FFmpeg style. diff -r 3ba304b8cbd2 -r 4c894b716948 rawdec.c --- a/rawdec.c Fri May 21 23:19:45 2010 +0000 +++ b/rawdec.c Fri May 21 23:19:50 2010 +0000 @@ -35,7 +35,7 @@ AVFrame pic; ///< AVCodecContext.coded_frame } RawVideoContext; -static const PixelFormatTag pixelFormatBpsAVI[] = { +static const PixelFormatTag pix_fmt_bps_avi[] = { { PIX_FMT_PAL8, 4 }, { PIX_FMT_PAL8, 8 }, { PIX_FMT_RGB555, 15 }, @@ -45,7 +45,7 @@ { PIX_FMT_NONE, 0 }, }; -static const PixelFormatTag pixelFormatBpsMOV[] = { +static const PixelFormatTag pix_fmt_bps_mov[] = { { PIX_FMT_MONOWHITE, 1 }, { PIX_FMT_PAL8, 2 }, { PIX_FMT_PAL8, 4 }, @@ -73,11 +73,11 @@ RawVideoContext *context = avctx->priv_data; if (avctx->codec_tag == MKTAG('r','a','w',' ')) - avctx->pix_fmt = find_pix_fmt(pixelFormatBpsMOV, avctx->bits_per_coded_sample); + avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_mov, avctx->bits_per_coded_sample); else if (avctx->codec_tag) avctx->pix_fmt = find_pix_fmt(ff_raw_pix_fmt_tags, avctx->codec_tag); else if (avctx->bits_per_coded_sample) - avctx->pix_fmt = find_pix_fmt(pixelFormatBpsAVI, avctx->bits_per_coded_sample); + avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi, avctx->bits_per_coded_sample); context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); context->buffer = av_malloc(context->length);