mirror of
https://github.com/mpv-player/mpv
synced 2025-03-22 19:34:14 +00:00
revert #ifdef WORDS_BIGENDIAN => #if WORDS_BIGENDIAN changes from r28331
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28334 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
707afbe9d6
commit
0f224d32dc
@ -179,7 +179,7 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m
|
|||||||
buf16[2] = 0x0001; // data-type ac3
|
buf16[2] = 0x0001; // data-type ac3
|
||||||
buf16[2] |= (sh_audio->a_in_buffer[5] & 0x7) << 8; // bsmod
|
buf16[2] |= (sh_audio->a_in_buffer[5] & 0x7) << 8; // bsmod
|
||||||
buf16[3] = len << 3; // number of bits in payload
|
buf16[3] = len << 3; // number of bits in payload
|
||||||
#if WORDS_BIGENDIAN
|
#ifdef WORDS_BIGENDIAN
|
||||||
memcpy(buf + 8, sh_audio->a_in_buffer, len);
|
memcpy(buf + 8, sh_audio->a_in_buffer, len);
|
||||||
#else
|
#else
|
||||||
swab(sh_audio->a_in_buffer, buf + 8, len);
|
swab(sh_audio->a_in_buffer, buf + 8, len);
|
||||||
@ -523,7 +523,7 @@ static int decode_audio_dts(unsigned char *indata_ptr, int len, unsigned char *b
|
|||||||
buf16[3] = fsize << 3;
|
buf16[3] = fsize << 3;
|
||||||
|
|
||||||
if (!convert_16bits) {
|
if (!convert_16bits) {
|
||||||
#if WORDS_BIGENDIAN
|
#ifdef WORDS_BIGENDIAN
|
||||||
/* BE stream */
|
/* BE stream */
|
||||||
if (indata_ptr[0] == 0x1f || indata_ptr[0] == 0x7f)
|
if (indata_ptr[0] == 0x1f || indata_ptr[0] == 0x7f)
|
||||||
#else
|
#else
|
||||||
|
@ -892,7 +892,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
|
|||||||
mpi->stride[2]*=2;
|
mpi->stride[2]*=2;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if WORDS_BIGENDIAN
|
#ifdef WORDS_BIGENDIAN
|
||||||
// FIXME: this might cause problems for buffers with FF_BUFFER_HINTS_PRESERVE
|
// FIXME: this might cause problems for buffers with FF_BUFFER_HINTS_PRESERVE
|
||||||
if (mpi->bpp == 8)
|
if (mpi->bpp == 8)
|
||||||
swap_palette(mpi->planes[1]);
|
swap_palette(mpi->planes[1]);
|
||||||
|
@ -231,7 +231,7 @@ void vf_mpi_clear(mp_image_t* mpi,int x0,int y0,int w,int h){
|
|||||||
unsigned int* p=(unsigned int*) dst;
|
unsigned int* p=(unsigned int*) dst;
|
||||||
int size=(mpi->bpp>>3)*w/4;
|
int size=(mpi->bpp>>3)*w/4;
|
||||||
int i;
|
int i;
|
||||||
#if WORDS_BIGENDIAN
|
#ifdef WORDS_BIGENDIAN
|
||||||
#define CLEAR_PACKEDYUV_PATTERN 0x00800080
|
#define CLEAR_PACKEDYUV_PATTERN 0x00800080
|
||||||
#define CLEAR_PACKEDYUV_PATTERN_SWAPPED 0x80008000
|
#define CLEAR_PACKEDYUV_PATTERN_SWAPPED 0x80008000
|
||||||
#else
|
#else
|
||||||
|
@ -322,7 +322,7 @@ static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi){
|
|||||||
static void scale(struct SwsContext *sws1, struct SwsContext *sws2, uint8_t *src[3], int src_stride[3], int y, int h,
|
static void scale(struct SwsContext *sws1, struct SwsContext *sws2, uint8_t *src[3], int src_stride[3], int y, int h,
|
||||||
uint8_t *dst[3], int dst_stride[3], int interlaced){
|
uint8_t *dst[3], int dst_stride[3], int interlaced){
|
||||||
uint8_t *src2[3]={src[0], src[1], src[2]};
|
uint8_t *src2[3]={src[0], src[1], src[2]};
|
||||||
#if WORDS_BIGENDIAN
|
#ifdef WORDS_BIGENDIAN
|
||||||
uint32_t pal2[256];
|
uint32_t pal2[256];
|
||||||
if (src[1] && !src[2]){
|
if (src[1] && !src[2]){
|
||||||
int i;
|
int i;
|
||||||
|
Loading…
Reference in New Issue
Block a user