diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-12 22:37:12 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-13 15:13:02 -0400 |
| commit | e1b8d88d52028a1c064dc1c2c96c1e0b200c73a1 (patch) | |
| tree | e5c66d97e55b696e739fa15b8ac85c06966b9fa2 | |
| parent | 37b67f1bff8662219a9a837e8bdba072f14ec990 (diff) | |
| download | ffmpeg-e1b8d88d52028a1c064dc1c2c96c1e0b200c73a1.tar.gz | |
mlpdec: remove unnecessary wrapper function
| -rw-r--r-- | libavcodec/mlpdec.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index f39e963edf..794f8964d0 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -901,14 +901,15 @@ static void rematrix_channels(MLPDecodeContext *m, unsigned int substr) /** Write the audio data into the output buffer. */ -static int output_data_internal(MLPDecodeContext *m, unsigned int substr, - uint8_t *data, unsigned int *data_size, int is32) +static int output_data(MLPDecodeContext *m, unsigned int substr, + uint8_t *data, unsigned int *data_size) { SubStream *s = &m->substream[substr]; unsigned int i, out_ch = 0; int out_size; int32_t *data_32 = (int32_t*) data; int16_t *data_16 = (int16_t*) data; + int is32 = (m->avctx->sample_fmt == AV_SAMPLE_FMT_S32); if (m->avctx->channels != s->max_matrix_channel + 1) { av_log(m->avctx, AV_LOG_ERROR, "channel count mismatch\n"); @@ -937,16 +938,6 @@ static int output_data_internal(MLPDecodeContext *m, unsigned int substr, return 0; } -static int output_data(MLPDecodeContext *m, unsigned int substr, - uint8_t *data, unsigned int *data_size) -{ - if (m->avctx->sample_fmt == AV_SAMPLE_FMT_S32) - return output_data_internal(m, substr, data, data_size, 1); - else - return output_data_internal(m, substr, data, data_size, 0); -} - - /** Read an access unit from the stream. * @return negative on error, 0 if not enough data is present in the input stream, * otherwise the number of bytes consumed. */ |