diff options
| author | Måns Rullgård <mans@mansr.com> | 2009-07-26 12:20:04 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2009-07-26 12:20:04 +0000 |
| commit | 63613fe615160671b394a232c1a3736319a6a8ec (patch) | |
| tree | 4e85211d5388b91b47facca7700512abdd36446d /libavformat | |
| parent | 84c04e25196a59694abec3ae17af476994bc5ce8 (diff) | |
| download | ffmpeg-63613fe615160671b394a232c1a3736319a6a8ec.tar.gz | |
Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN
Originally committed as revision 19508 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/asfdec.c | 2 | ||||
| -rw-r--r-- | libavformat/avidec.c | 2 | ||||
| -rw-r--r-- | libavformat/flvdec.c | 2 | ||||
| -rw-r--r-- | libavformat/mtv.c | 4 | ||||
| -rw-r--r-- | libavformat/raw.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 9f445ecc4f..df39bb9857 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -364,7 +364,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) /* This is true for all paletted codecs implemented in ffmpeg */ if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) { st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl)); -#ifdef WORDS_BIGENDIAN +#if HAVE_BIGENDIAN for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++) st->codec->palctrl->palette[i] = bswap_32(((uint32_t*)st->codec->extradata)[i]); #else diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 56b6204e04..cd8c613ed0 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -498,7 +498,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) /* This is true for all paletted codecs implemented in FFmpeg. */ if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) { st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl)); -#ifdef WORDS_BIGENDIAN +#if HAVE_BIGENDIAN for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++) st->codec->palctrl->palette[i] = bswap_32(((uint32_t*)st->codec->extradata)[i]); #else diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 9505487aa8..a34041e748 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -77,7 +77,7 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_c //no distinction between S16 and S8 PCM codec flags case FLV_CODECID_PCM: acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_S8 : -#ifdef WORDS_BIGENDIAN +#if HAVE_BIGENDIAN CODEC_ID_PCM_S16BE; #else CODEC_ID_PCM_S16LE; diff --git a/libavformat/mtv.c b/libavformat/mtv.c index 564cb44762..1ebeaee8a9 100644 --- a/libavformat/mtv.c +++ b/libavformat/mtv.c @@ -129,7 +129,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt) MTVDemuxContext *mtv = s->priv_data; ByteIOContext *pb = s->pb; int ret; -#ifndef WORDS_BIGENDIAN +#if !HAVE_BIGENDIAN int i; #endif @@ -150,7 +150,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt) if(ret != mtv->img_segment_size) return AVERROR(EIO); -#ifndef WORDS_BIGENDIAN +#if !HAVE_BIGENDIAN /* pkt->data is GGGRRRR BBBBBGGG * and we need RRRRRGGG GGGBBBBB diff --git a/libavformat/raw.c b/libavformat/raw.c index 7cd62ffc31..c52235f47b 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -1103,7 +1103,7 @@ AVOutputFormat null_muxer = { NULL, NULL, 0, -#ifdef WORDS_BIGENDIAN +#if HAVE_BIGENDIAN CODEC_ID_PCM_S16BE, #else CODEC_ID_PCM_S16LE, @@ -1232,7 +1232,7 @@ AVOutputFormat pcm_ ## name ## _muxer = {\ #define PCMDEF(name, long_name, ext, codec) #endif -#ifdef WORDS_BIGENDIAN +#if HAVE_BIGENDIAN #define BE_DEF(s) s #define LE_DEF(s) NULL #else |