Mercurial > libavcodec.hg
comparison libfaad.c @ 7158:bfbb2df9963a libavcodec
set frame_size in libfaad decoder
| author | bcoudurier |
|---|---|
| date | Sat, 28 Jun 2008 19:41:18 +0000 |
| parents | e943e1409077 |
| children | 85ab7655ad4d |
comparison
equal
deleted
inserted
replaced
| 7157:b76ee34ea184 | 7158:bfbb2df9963a |
|---|---|
| 194 if (frame_info.error > 0) { | 194 if (frame_info.error > 0) { |
| 195 av_log(avctx, AV_LOG_ERROR, "faac: frame decoding failed: %s\n", | 195 av_log(avctx, AV_LOG_ERROR, "faac: frame decoding failed: %s\n", |
| 196 s->faacDecGetErrorMessage(frame_info.error)); | 196 s->faacDecGetErrorMessage(frame_info.error)); |
| 197 return -1; | 197 return -1; |
| 198 } | 198 } |
| 199 | 199 if (!avctx->frame_size) |
| 200 avctx->frame_size = frame_info.samples/avctx->channels; | |
| 200 frame_info.samples *= s->sample_size; | 201 frame_info.samples *= s->sample_size; |
| 201 memcpy(data, out, frame_info.samples); // CHECKME - can we cheat this one | 202 memcpy(data, out, frame_info.samples); // CHECKME - can we cheat this one |
| 202 | 203 |
| 203 if (data_size) | 204 if (data_size) |
| 204 *data_size = frame_info.samples; | 205 *data_size = frame_info.samples; |