# HG changeset patch # User stefano # Date 1274396951 0 # Node ID 378caf7b42ef31a4e4333cabab97002206c78c11 # Parent d7a5fc4b7aee1cfa14f9604560154841c366a043 Rename ff_raw_pixelFormatTags symbol to ff_raw_pix_fmt_tags. The new name is shorter and consistent with the FFmpeg style. diff -r d7a5fc4b7aee -r 378caf7b42ef avcodec.h --- a/avcodec.h Thu May 20 21:27:01 2010 +0000 +++ b/avcodec.h Thu May 20 23:09:11 2010 +0000 @@ -31,7 +31,7 @@ #define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MINOR 68 -#define LIBAVCODEC_VERSION_MICRO 2 +#define LIBAVCODEC_VERSION_MICRO 3 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff -r d7a5fc4b7aee -r 378caf7b42ef raw.c --- a/raw.c Thu May 20 21:27:01 2010 +0000 +++ b/raw.c Thu May 20 23:09:11 2010 +0000 @@ -27,7 +27,7 @@ #include "avcodec.h" #include "raw.h" -const PixelFormatTag ff_raw_pixelFormatTags[] = { +const PixelFormatTag ff_raw_pix_fmt_tags[] = { { PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */ { PIX_FMT_YUV420P, MKTAG('I', 'Y', 'U', 'V') }, { PIX_FMT_YUV420P, MKTAG('Y', 'V', '1', '2') }, @@ -114,7 +114,7 @@ unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat fmt) { - const PixelFormatTag * tags = ff_raw_pixelFormatTags; + const PixelFormatTag *tags = ff_raw_pix_fmt_tags; while (tags->pix_fmt >= 0) { if (tags->pix_fmt == fmt) return tags->fourcc; diff -r d7a5fc4b7aee -r 378caf7b42ef raw.h --- a/raw.h Thu May 20 21:27:01 2010 +0000 +++ b/raw.h Thu May 20 23:09:11 2010 +0000 @@ -34,6 +34,6 @@ unsigned int fourcc; } PixelFormatTag; -extern const PixelFormatTag ff_raw_pixelFormatTags[]; +extern const PixelFormatTag ff_raw_pix_fmt_tags[]; #endif /* AVCODEC_RAW_H */ diff -r d7a5fc4b7aee -r 378caf7b42ef rawdec.c --- a/rawdec.c Thu May 20 21:27:01 2010 +0000 +++ b/rawdec.c Thu May 20 23:09:11 2010 +0000 @@ -75,7 +75,7 @@ if (avctx->codec_tag == MKTAG('r','a','w',' ')) avctx->pix_fmt = findPixelFormat(pixelFormatBpsMOV, avctx->bits_per_coded_sample); else if (avctx->codec_tag) - avctx->pix_fmt = findPixelFormat(ff_raw_pixelFormatTags, avctx->codec_tag); + avctx->pix_fmt = findPixelFormat(ff_raw_pix_fmt_tags, avctx->codec_tag); else if (avctx->bits_per_coded_sample) avctx->pix_fmt = findPixelFormat(pixelFormatBpsAVI, avctx->bits_per_coded_sample);