summaryrefslogtreecommitdiff
path: root/libavcodec/rawdec.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-05-21 23:19:50 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-05-21 23:19:50 +0000
commit6a2c9b8bcbbc3e892abd1c63ad322bac7d5d4989 (patch)
treeb75a70778ee7b3569ceb0b18fce70c90b0a71337 /libavcodec/rawdec.c
parent1beff414a2acd63a6caf68de42d329c1242367de (diff)
Rename pixelFormatBpsAVI to pix_fmt_bps_avi and pixelFormatBpsMOV to
pix_fmt_bps_mov. The new names are consistent with the predominant FFmpeg style. Originally committed as revision 23244 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/rawdec.c')
-rw-r--r--libavcodec/rawdec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index d951ad860b..a73b293aae 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -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 pixelFormatBpsAVI[] = {
{ 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(AVCodecContext *avctx)
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);