[01/12] libopencore-amr: Remove unused code fragments

Message ID 1302645498-12642-1-git-send-email-martin@martin.st
State Committed
Commit dbff4da91468a5079d017b99f961cb8bfc4e019c
Headers show

Commit Message

Martin Storsjö April 12, 2011, 9:58 p.m.
This parts are heritage from the encoder part from the old
libamr code removed in SVN rev 19365.
---
 libavcodec/libopencore-amr.c |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

Comments

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

On Tue, Apr 12, 2011 at 5:58 PM, Martin Storsjö <martin@martin.st> wrote:
> This parts are heritage from the encoder part from the old
> libamr code removed in SVN rev 19365.
> ---
>  libavcodec/libopencore-amr.c |   11 -----------
>  1 files changed, 0 insertions(+), 11 deletions(-)

OK.

(Although in a way it'd be nice to print a warning message if the
bitrate could not be adhered to. This doesn't stop people from using
crappy generic wrapper toys, but at the same time it's helpful to
people trying to create a AMRWB-specific script but not understanding
the fine details of the format.)

Ronald

Patch

diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c
index a7abe26..c11c924 100644
--- a/libavcodec/libopencore-amr.c
+++ b/libavcodec/libopencore-amr.c
@@ -239,20 +239,9 @@  AVCodec ff_libopencore_amrnb_encoder = {
 #include <opencore-amrwb/dec_if.h>
 #include <opencore-amrwb/if_rom.h>
 
-static const char wb_bitrate_unsupported[] =
-    "bitrate not supported: use one of 6.6k, 8.85k, 12.65k, 14.25k, 15.85k, 18.25k, 19.85k, 23.05k, or 23.85k\n";
-
-/* Common code for fixed and float version*/
-typedef struct AMRWB_bitrates {
-    int rate;
-    int mode;
-} AMRWB_bitrates;
-
 typedef struct AMRWBContext {
     int    frameCount;
     void  *state;
-    int    mode;
-    Word16 allow_dtx;
 } AMRWBContext;
 
 static av_cold int amr_wb_decode_init(AVCodecContext *avctx)