diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-05-20 23:09:11 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-05-20 23:09:11 +0000 |
| commit | 6531b5c9f4388d28183be8f04d6cf2b42a2eee93 (patch) | |
| tree | 74b7342512bd6af5115b13c9ba7e17d57c8f093d /libavcodec | |
| parent | 4d2f703a34bae1bf0a56a751fa5546466ac1f03c (diff) | |
| download | ffmpeg-6531b5c9f4388d28183be8f04d6cf2b42a2eee93.tar.gz | |
Rename ff_raw_pixelFormatTags symbol to ff_raw_pix_fmt_tags.
The new name is shorter and consistent with the FFmpeg style.
Originally committed as revision 23206 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/raw.c | 4 | ||||
| -rw-r--r-- | libavcodec/raw.h | 2 | ||||
| -rw-r--r-- | libavcodec/rawdec.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ec39dac109..8781c0a452 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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 --git a/libavcodec/raw.c b/libavcodec/raw.c index 022a96f61d..be9bdea8d1 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -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 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = { 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 --git a/libavcodec/raw.h b/libavcodec/raw.h index e74006ac3c..4eece61e97 100644 --- a/libavcodec/raw.h +++ b/libavcodec/raw.h @@ -34,6 +34,6 @@ typedef struct PixelFormatTag { unsigned int fourcc; } PixelFormatTag; -extern const PixelFormatTag ff_raw_pixelFormatTags[]; +extern const PixelFormatTag ff_raw_pix_fmt_tags[]; #endif /* AVCODEC_RAW_H */ diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 8b398d2dc9..afbc966e4e 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -75,7 +75,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) 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); |