summaryrefslogtreecommitdiff
path: root/src/libffmpeg
diff options
context:
space:
mode:
Diffstat (limited to 'src/libffmpeg')
-rw-r--r--src/libffmpeg/ff_audio_decoder.c12
-rw-r--r--src/libffmpeg/ff_video_decoder.c6
2 files changed, 9 insertions, 9 deletions
diff --git a/src/libffmpeg/ff_audio_decoder.c b/src/libffmpeg/ff_audio_decoder.c
index e0d6e5cab..8ebb5ce64 100644
--- a/src/libffmpeg/ff_audio_decoder.c
+++ b/src/libffmpeg/ff_audio_decoder.c
@@ -198,21 +198,21 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
this->context->block_align = 240;
break;
case BUF_AUDIO_28_8:
- this->audio_sample_rate = BE_16(&this->buf[0x30]);
+ this->audio_sample_rate = _X_BE_16(&this->buf[0x30]);
this->audio_channels = this->buf[0x37];
/* this->audio_bits = buf->content[0x35] */
- this->context->block_align = BE_16(&this->buf[0x2A]);
+ this->context->block_align = _X_BE_16(&this->buf[0x2A]);
this->context->extradata_size = 5*sizeof(short);
this->context->extradata = xine_xmalloc(this->context->extradata_size);
ptr = (short *) this->context->extradata;
- ptr[0] = BE_16(&this->buf[0x2C]); /* subpacket size */
- ptr[1] = BE_16(&this->buf[0x28]); /* subpacket height */
- ptr[2] = BE_16(&this->buf[0x16]); /* subpacket flavour */
- ptr[3] = BE_32(&this->buf[0x18]); /* coded frame size */
+ ptr[0] = _X_BE_16(&this->buf[0x2C]); /* subpacket size */
+ ptr[1] = _X_BE_16(&this->buf[0x28]); /* subpacket height */
+ ptr[2] = _X_BE_16(&this->buf[0x16]); /* subpacket flavour */
+ ptr[3] = _X_BE_32(&this->buf[0x18]); /* coded frame size */
ptr[4] = 0; /* codec's data length */
break;
default:
diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c
index 3943fd05d..66cbc7d75 100644
--- a/src/libffmpeg/ff_video_decoder.c
+++ b/src/libffmpeg/ff_video_decoder.c
@@ -880,10 +880,10 @@ static void ff_handle_header_buffer (ff_video_decoder_t *this, buf_element_t *bu
switch (codec_type) {
case BUF_VIDEO_RV10:
case BUF_VIDEO_RV20:
- this->bih.biWidth = BE_16(&this->buf[12]);
- this->bih.biHeight = BE_16(&this->buf[14]);
+ this->bih.biWidth = _X_BE_16(&this->buf[12]);
+ this->bih.biHeight = _X_BE_16(&this->buf[14]);
- this->context->sub_id = BE_32(&this->buf[30]);
+ this->context->sub_id = _X_BE_32(&this->buf[30]);
this->context->slice_offset = xine_xmalloc(sizeof(int)*SLICE_OFFSET_SIZE);
this->slice_offset_size = SLICE_OFFSET_SIZE;