mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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
This commit is contained in:
parent
4d2f703a34
commit
6531b5c9f4
@ -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, \
|
||||
|
@ -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;
|
||||
|
@ -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 */
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user