Commit 6531b5c9 authored by Stefano Sabatini's avatar Stefano Sabatini

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
parent 4d2f703a
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 68 #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, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "raw.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', '4', '2', '0') }, /* Planar formats */
{ PIX_FMT_YUV420P, MKTAG('I', 'Y', 'U', 'V') }, { PIX_FMT_YUV420P, MKTAG('I', 'Y', 'U', 'V') },
{ PIX_FMT_YUV420P, MKTAG('Y', 'V', '1', '2') }, { PIX_FMT_YUV420P, MKTAG('Y', 'V', '1', '2') },
...@@ -114,7 +114,7 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = { ...@@ -114,7 +114,7 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = {
unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat fmt) 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) { while (tags->pix_fmt >= 0) {
if (tags->pix_fmt == fmt) if (tags->pix_fmt == fmt)
return tags->fourcc; return tags->fourcc;
......
...@@ -34,6 +34,6 @@ typedef struct PixelFormatTag { ...@@ -34,6 +34,6 @@ typedef struct PixelFormatTag {
unsigned int fourcc; unsigned int fourcc;
} PixelFormatTag; } PixelFormatTag;
extern const PixelFormatTag ff_raw_pixelFormatTags[]; extern const PixelFormatTag ff_raw_pix_fmt_tags[];
#endif /* AVCODEC_RAW_H */ #endif /* AVCODEC_RAW_H */
...@@ -75,7 +75,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) ...@@ -75,7 +75,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
if (avctx->codec_tag == MKTAG('r','a','w',' ')) if (avctx->codec_tag == MKTAG('r','a','w',' '))
avctx->pix_fmt = findPixelFormat(pixelFormatBpsMOV, avctx->bits_per_coded_sample); avctx->pix_fmt = findPixelFormat(pixelFormatBpsMOV, avctx->bits_per_coded_sample);
else if (avctx->codec_tag) 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) else if (avctx->bits_per_coded_sample)
avctx->pix_fmt = findPixelFormat(pixelFormatBpsAVI, avctx->bits_per_coded_sample); avctx->pix_fmt = findPixelFormat(pixelFormatBpsAVI, avctx->bits_per_coded_sample);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment