summaryrefslogtreecommitdiff
path: root/src/libffmpeg/ff_video_decoder.c
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-06-16 15:34:23 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-06-16 15:34:23 +0200
commit5935b6fbe5c4d83ea35a1464b3a1c32e00b23304 (patch)
treee4d1ef387a60a17eb797b2b837dc446a009fa19a /src/libffmpeg/ff_video_decoder.c
parentea58c6bc3db42aad918da8c90ce05997909e7eb8 (diff)
downloadxine-lib-5935b6fbe5c4d83ea35a1464b3a1c32e00b23304.tar.gz
xine-lib-5935b6fbe5c4d83ea35a1464b3a1c32e00b23304.tar.bz2
Rename the BE/LE/ME macros with a _X_ prefix, so they don't clash with Solaris definitions (1.2 branch commit).
Diffstat (limited to 'src/libffmpeg/ff_video_decoder.c')
-rw-r--r--src/libffmpeg/ff_video_decoder.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c
index d7d162387..fd7d6a795 100644
--- a/src/libffmpeg/ff_video_decoder.c
+++ b/src/libffmpeg/ff_video_decoder.c
@@ -878,10 +878,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;