generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cosmetics: Remove pointless {}.

Browse Source 
Originally committed as revision 18848 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun
2009-05-15 20:12:45 +00:00
parent e09989be45
commit 76b58f9f94
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/libamr.c
View File

@@ -88,12 +88,8 @@ static int getBitrateMode(int bitrate)
int i; int i;
for(i=0;i<8;i++) for(i=0;i<8;i++)
{
if(rates[i].rate==bitrate) if(rates[i].rate==bitrate)
{
return rates[i].mode; return rates[i].mode;
}
}
/* no bitrate matching, return an error */ /* no bitrate matching, return an error */
return -1; return -1;
} }
@@ -103,14 +99,10 @@ static void amr_decode_fix_avctx(AVCodecContext * avctx)
const int is_amr_wb = 1 + (avctx->codec_id == CODEC_ID_AMR_WB); const int is_amr_wb = 1 + (avctx->codec_id == CODEC_ID_AMR_WB);
if(avctx->sample_rate == 0) if(avctx->sample_rate == 0)
{
avctx->sample_rate = 8000 * is_amr_wb; avctx->sample_rate = 8000 * is_amr_wb;
}
if(avctx->channels == 0) if(avctx->channels == 0)
{
avctx->channels = 1; avctx->channels = 1;
}
avctx->frame_size = 160 * is_amr_wb; avctx->frame_size = 160 * is_amr_wb;
avctx->sample_fmt = SAMPLE_FMT_S16; avctx->sample_fmt = SAMPLE_FMT_S16;
@@ -329,12 +321,8 @@ static int getWBBitrateMode(int bitrate)
int i; int i;
for(i=0;i<9;i++) for(i=0;i<9;i++)
{
if(rates[i].rate==bitrate) if(rates[i].rate==bitrate)
{
return rates[i].mode; return rates[i].mode;
}
}
/* no bitrate matching, return an error */ /* no bitrate matching, return an error */
return -1; return -1;
} }
@@ -443,10 +431,9 @@ static int amr_wb_decode_frame(AVCodecContext * avctx,
int packet_size; int packet_size;
static const uint8_t block_size[16] = {18, 23, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1}; static const uint8_t block_size[16] = {18, 23, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1};
if(buf_size==0) { if(buf_size==0)
/* nothing to do */ /* nothing to do */
return 0; return 0;
}
mode = (amrData[0] >> 3) & 0x000F; mode = (amrData[0] >> 3) & 0x000F;
packet_size = block_size[mode]; packet_size = block_size[mode];