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

Commit 6d62049c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "m4v_h263 no longer requires consumers to define OSCL_* macros"

parents 10804cc7 2b92f9f3

media/libstagefright/codecs/m4v_h263/dec/Android.bp

+0 −5
Original line number Original line Diff line number Diff line
@@ -47,9 +47,6 @@ cc_library_static { 
    export_include_dirs: ["include"],

    export_include_dirs: ["include"],





    cflags: [

    cflags: [

        "-DOSCL_EXPORT_REF=",

        "-DOSCL_IMPORT_REF=",



        "-Werror",

        "-Werror",

    ],

    ],
@@ -74,8 +71,6 @@ cc_library_shared { 
    local_include_dirs: ["src"],

    local_include_dirs: ["src"],





    cflags: [

    cflags: [

        "-DOSCL_EXPORT_REF=",

        "-DOSCL_IMPORT_REF=",

    ],

    ],





    static_libs: ["libstagefright_m4vh263dec"],

    static_libs: ["libstagefright_m4vh263dec"],

media/libstagefright/codecs/m4v_h263/dec/include/mp4dec_api.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,13 @@ typedef uint Bool; 
#define PV_TRUE  1

#define PV_TRUE  1

#define PV_FALSE 0

#define PV_FALSE 0





#ifndef OSCL_IMPORT_REF

#define OSCL_IMPORT_REF /* empty */

#endif

#ifndef OSCL_EXPORT_REF

#define OSCL_EXPORT_REF /* empty */

#endif



/* flag for post-processing  4/25/00 */

/* flag for post-processing  4/25/00 */





#ifdef DEC_NOPOSTPROC

#ifdef DEC_NOPOSTPROC

media/libstagefright/codecs/m4v_h263/dec/test/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,6 @@ cc_test { 
    ],

    ],





    cflags: [

    cflags: [

        "-DOSCL_IMPORT_REF=",

        "-Werror",

        "-Werror",

        "-Wall",

        "-Wall",

    ],

    ],

media/libstagefright/codecs/m4v_h263/enc/Android.bp

+0 −9
Original line number Original line Diff line number Diff line
@@ -23,10 +23,6 @@ cc_library_static { 




    cflags: [

    cflags: [

        "-DBX_RC",

        "-DBX_RC",

        "-DOSCL_IMPORT_REF=",

        "-DOSCL_UNUSED_ARG(x)=(void)(x)",

        "-DOSCL_EXPORT_REF=",



        "-Werror",

        "-Werror",

    ],

    ],
@@ -55,9 +51,6 @@ cc_library_shared { 




    cflags: [

    cflags: [

        "-DBX_RC",

        "-DBX_RC",

        "-DOSCL_IMPORT_REF=",

        "-DOSCL_UNUSED_ARG(x)=(void)(x)",

        "-DOSCL_EXPORT_REF=",

    ],

    ],





    static_libs: ["libstagefright_m4vh263enc"],

    static_libs: ["libstagefright_m4vh263enc"],
@@ -81,8 +74,6 @@ cc_test { 
    local_include_dirs: ["src"],

    local_include_dirs: ["src"],





    cflags: [

    cflags: [

        "-DOSCL_EXPORT_REF=",

        "-DOSCL_IMPORT_REF=",

        "-DBX_RC",

        "-DBX_RC",

        "-Wall",

        "-Wall",

        "-Werror",

        "-Werror",

media/libstagefright/codecs/m4v_h263/enc/include/mp4enc_api.h

+10 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,16 @@ typedef uint32_t ULong; 
#define PV_TRUE  1

#define PV_TRUE  1

#define PV_FALSE 0

#define PV_FALSE 0





#ifndef OSCL_IMPORT_REF

#define OSCL_IMPORT_REF /* empty */

#endif

#ifndef OSCL_EXPORT_REF

#define OSCL_EXPORT_REF /* empty */

#endif

#ifndef OSCL_UNUSED_ARG

#define OSCL_UNUSED_ARG(x) ((void)(x))

#endif



typedef enum

typedef enum

{

{

    SHORT_HEADER,

    SHORT_HEADER,