[FFmpeg-cvslog] r23244 - trunk/libavcodec/rawdec.c
stefano
subversion
Sat May 22 01:19:50 CEST 2010
Author: stefano
Date: Sat May 22 01:19:50 2010
New Revision: 23244
Log:
Rename pixelFormatBpsAVI to pix_fmt_bps_avi and pixelFormatBpsMOV to
pix_fmt_bps_mov.
The new names are consistent with the predominant FFmpeg style.
Modified:
trunk/libavcodec/rawdec.c
Modified: trunk/libavcodec/rawdec.c
==============================================================================
--- trunk/libavcodec/rawdec.c Sat May 22 01:19:45 2010 (r23243)
+++ trunk/libavcodec/rawdec.c Sat May 22 01:19:50 2010 (r23244)
@@ -35,7 +35,7 @@ typedef struct RawVideoContext {
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 @@ static const PixelFormatTag pixelFormatB
{ 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 @@ static av_cold int raw_init_decoder(AVCo
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);
More information about the ffmpeg-cvslog
mailing list