Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93bc6176 authored by Abhishek Arya's avatar Abhishek Arya Committed by Android Git Automerger
Browse files

am 01841c73: am af46239a: am 9abb7401: Fix compile failure after... 

am 01841c73: am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '01841c73':
  Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
parents 91fc84f2 01841c73

media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp

+8 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,14 @@ 
#include "vlc_decode.h"

#include "vlc_decode.h"

#include "bitstream.h"

#include "bitstream.h"





#ifndef INT32_MAX

#define INT32_MAX 0x7fffffff

#endif



#ifndef SIZE_MAX

#define SIZE_MAX ((size_t) -1)

#endif



#define OSCL_DISABLE_WARNING_CONDITIONAL_IS_CONSTANT

#define OSCL_DISABLE_WARNING_CONDITIONAL_IS_CONSTANT





#ifdef DEC_INTERNAL_MEMORY_OPT

#ifdef DEC_INTERNAL_MEMORY_OPT

media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp

+7 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,13 @@ 
#include "rate_control.h"

#include "rate_control.h"

#include "m4venc_oscl.h"

#include "m4venc_oscl.h"





#ifndef INT32_MAX

#define INT32_MAX 0x7fffffff

#endif



#ifndef SIZE_MAX

#define SIZE_MAX ((size_t) -1)

#endif





/* Inverse normal zigzag */

/* Inverse normal zigzag */

const static Int zigzag_i[NCOEFF_BLOCK] =

const static Int zigzag_i[NCOEFF_BLOCK] =