[04/12] libopencore-amr: Remove an old workaround for libamr header weirdness

Message ID 1302645498-12642-4-git-send-email-martin@martin.st
State Committed
Commit 587331414bfee1fc73eb9bcd1e8aaae3a56ec5ee
Headers show

Commit Message

Martin Storsjö April 12, 2011, 9:58 p.m.
---
 libavcodec/libopencore-amr.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

Comments

Ronald Bultje April 12, 2011, 11:36 p.m. | #1
Hi,

On Tue, Apr 12, 2011 at 5:58 PM, Martin Storsjö <martin@martin.st> wrote:
> ---
>  libavcodec/libopencore-amr.c |    5 -----
>  1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c
> index 0e467a6..13594fa 100644
> --- a/libavcodec/libopencore-amr.c
> +++ b/libavcodec/libopencore-amr.c
> @@ -219,11 +219,6 @@ AVCodec ff_libopencore_amrnb_encoder = {
>  /* -----------AMR wideband ------------*/
>  #if CONFIG_LIBOPENCORE_AMRWB
>
> -#ifdef _TYPEDEF_H
> -//To avoid duplicate typedefs from typedef in amr-nb
> -#define typedef_h
> -#endif
> -

OK, if that works.

Ronald

Patch

diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c
index 0e467a6..13594fa 100644
--- a/libavcodec/libopencore-amr.c
+++ b/libavcodec/libopencore-amr.c
@@ -219,11 +219,6 @@  AVCodec ff_libopencore_amrnb_encoder = {
 /* -----------AMR wideband ------------*/
 #if CONFIG_LIBOPENCORE_AMRWB
 
-#ifdef _TYPEDEF_H
-//To avoid duplicate typedefs from typedef in amr-nb
-#define typedef_h
-#endif
-
 #include <opencore-amrwb/dec_if.h>
 #include <opencore-amrwb/if_rom.h>