[SCM] libav/experimental: Rename pixelFormatBpsAVI to pix_fmt_bps_avi and pixelFormatBpsMOV to pix_fmt_bps_mov.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:07:25 UTC 2013


The following commit has been merged in the experimental branch:
commit 6a2c9b8bcbbc3e892abd1c63ad322bac7d5d4989
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Fri May 21 23:19:50 2010 +0000

    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

diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index d951ad8..a73b293 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);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list