shithub: libvpx

Info  •  Files  •  Log  •  Branches

Fixing compilation error on Mac OS.

The error happened because of vp8_decrypt_cb typedef redefinition in both
treereader.h and vp8dx.h. Removing typedef from vp8dx.h in favor of raw
function pointer declaration.

Change-Id: I0266eb341ce433d40caf0abf8748694d505ee786

--- a/vpx/vp8dx.h

+++ b/vpx/vp8dx.h

@@ -75,15 +75,12 @@

   VP8_DECODER_CTRL_ID_MAX

 };

-

-/*Decrypt n bytes of data from input -> output, using the decrypt_state

-   passed in VP8D_SET_DECRYPTOR.

-*/

-typedef void (vp8_decrypt_cb)(void *decrypt_state, const unsigned char *input,

-                              unsigned char *output, int count);

-

 typedef struct vp8_decrypt_init {

-    vp8_decrypt_cb *decrypt_cb;

+    /** Decrypt n bytes of data from input -> output, using the decrypt_state

+     *  passed in VP8D_SET_DECRYPTOR.

+     */

+    void (*decrypt_cb)(void *decrypt_state, const unsigned char *input,

+                       unsigned char *output, int count);

     void *decrypt_state;

 } vp8_decrypt_init;