virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

8svx: use a more direct condition.

Browse Source 
esc->table was inited based on codec->id: re-testing codec->id
is code duplication and can lead to inconsistencies.
This commit is contained in:
Nicolas George 2012-07-29 12:33:35 +02:00
parent 9009fa6de4
commit 1c98781837
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/8svx.c
View File

@ -112,13 +112,13 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data,
if (!esc->samples && avpkt) { if (!esc->samples && avpkt) {
uint8_t *deinterleaved_samples, *p = NULL; uint8_t *deinterleaved_samples, *p = NULL;
esc->samples_size = avctx->codec->id == CODEC_ID_8SVX_RAW || avctx->codec->id ==CODEC_ID_PCM_S8_PLANAR? esc->samples_size = !esc->table ?
avpkt->size : avctx->channels + (avpkt->size-avctx->channels) * 2; avpkt->size : avctx->channels + (avpkt->size-avctx->channels) * 2;
if (!(esc->samples = av_malloc(esc->samples_size))) if (!(esc->samples = av_malloc(esc->samples_size)))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
/* decompress */ /* decompress */
if (avctx->codec->id == CODEC_ID_8SVX_FIB || avctx->codec->id == CODEC_ID_8SVX_EXP) { if (esc->table) {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
int n = esc->samples_size; int n = esc->samples_size;
@ -166,7 +166,7 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data,
*dst++ = *src++ + 128; *dst++ = *src++ + 128;
esc->samples_idx += out_data_size; esc->samples_idx += out_data_size;
return avctx->codec->id == CODEC_ID_8SVX_FIB || avctx->codec->id == CODEC_ID_8SVX_EXP ? return esc->table ?
(avctx->frame_number == 0)*2 + out_data_size / 2 : (avctx->frame_number == 0)*2 + out_data_size / 2 :
out_data_size; out_data_size;
} }