diff amr.c @ 4843:0e11f292482f libavcodec

Replace hackish support for amr-nb and amr-wb. Instead of including the source of the reference implementation it is possible to use proper libraries now. patch by Stanislav Brabec, sbrabec suse cz, changes and bug fixes by me

--- a/amr.c	Thu Apr 12 10:27:40 2007 +0000
+++ b/amr.c	Thu Apr 12 10:59:52 2007 +0000
@@ -82,8 +82,8 @@
 #include "amr/e_homing.h"
 
 #else
-#include "amr_float/interf_dec.h"
-#include "amr_float/interf_enc.h"
+#include <amrnb/interf_dec.h>
+#include <amrnb/interf_enc.h>
 #endif
 
 static const char *nb_bitrate_unsupported =
@@ -532,8 +532,9 @@
 #define typedef_h
 #endif
 
-#include "amrwb_float/enc_if.h"
-#include "amrwb_float/dec_if.h"
+#include <amrwb/enc_if.h>
+#include <amrwb/dec_if.h>
+#include <amrwb/if_rom.h>
 
 /* Common code for fixed and float version*/
 typedef struct AMRWB_bitrates
@@ -652,8 +653,6 @@
     return 0;
 }
 
-extern const UWord8 block_size[];
-
 static int amr_wb_decode_frame(AVCodecContext * avctx,
             void *data, int *data_size,
             uint8_t * buf, int buf_size)