| 1 | --- mplayer/libavcodec/amr.c.orig 2007-04-13 23:19:37.000000000 +0200
|
|---|
| 2 | +++ mplayer/libavcodec/amr.c 2007-04-13 23:21:15.000000000 +0200
|
|---|
| 3 | @@ -86,8 +86,8 @@
|
|---|
| 4 | #include "amr/e_homing.h"
|
|---|
| 5 |
|
|---|
| 6 | #else
|
|---|
| 7 | -#include <amrnb/interf_dec.h>
|
|---|
| 8 | -#include <amrnb/interf_enc.h>
|
|---|
| 9 | +#include <amr_float/interf_dec.h>
|
|---|
| 10 | +#include <amr_float/interf_enc.h>
|
|---|
| 11 | #endif
|
|---|
| 12 |
|
|---|
| 13 | static const char *nb_bitrate_unsupported =
|
|---|
| 14 | @@ -536,9 +536,9 @@ AVCodec amr_nb_encoder =
|
|---|
| 15 | #define typedef_h
|
|---|
| 16 | #endif
|
|---|
| 17 |
|
|---|
| 18 | -#include <amrwb/enc_if.h>
|
|---|
| 19 | -#include <amrwb/dec_if.h>
|
|---|
| 20 | -#include <amrwb/if_rom.h>
|
|---|
| 21 | +#include <amrwb_float/enc_if.h>
|
|---|
| 22 | +#include <amrwb_float/dec_if.h>
|
|---|
| 23 | +#include <amrwb_float/if_rom.h>
|
|---|
| 24 |
|
|---|
| 25 | /* Common code for fixed and float version*/
|
|---|
| 26 | typedef struct AMRWB_bitrates
|
|---|
| 27 | @@ -665,6 +665,7 @@ static int amr_wb_decode_frame(AVCodecCo
|
|---|
| 28 | uint8_t*amrData=buf;
|
|---|
| 29 | int mode;
|
|---|
| 30 | int packet_size;
|
|---|
| 31 | + static short block_size[16]={ 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 };
|
|---|
| 32 |
|
|---|
| 33 | if(buf_size==0) {
|
|---|
| 34 | /* nothing to do */
|
|---|
