diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 15:54:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 15:55:41 +0200 |
| commit | bb35864759197ac17fe0057b0897f14b0fc54788 (patch) | |
| tree | 9ac2a32eb5293d6bcc9dd0fa06c6a660da523532 /libavcodec/mlpdec.c | |
| parent | 526cb36e4b23d2aae14bba0d19947137ee94f263 (diff) | |
| parent | 1ec629308652b382a409ffa61e049c074ee5e695 (diff) | |
| download | ffmpeg-bb35864759197ac17fe0057b0897f14b0fc54788.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mlpdsp: adding missing file
dsputil: split out mlp dsp function
sh4: add required #include, fix build
averror: make error values proper negative values
build: do not use LIB as variable name
build: whitespace cosmetics
build: remove single-use variable THIS_LIB
Conflicts:
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlpdec.c')
| -rw-r--r-- | libavcodec/mlpdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index ccd09b675c..d587982e8c 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -27,12 +27,12 @@ #include <stdint.h> #include "avcodec.h" -#include "dsputil.h" #include "libavutil/intreadwrite.h" #include "get_bits.h" #include "libavutil/crc.h" #include "parser.h" #include "mlp_parser.h" +#include "mlpdsp.h" #include "mlp.h" /** number of bits used for VLC lookup - longest Huffman code is 9 */ @@ -145,7 +145,7 @@ typedef struct MLPDecodeContext { int8_t bypassed_lsbs[MAX_BLOCKSIZE][MAX_CHANNELS]; int32_t sample_buffer[MAX_BLOCKSIZE][MAX_CHANNELS]; - DSPContext dsp; + MLPDSPContext dsp; } MLPDecodeContext; static VLC huff_vlc[3]; @@ -235,7 +235,7 @@ static av_cold int mlp_decode_init(AVCodecContext *avctx) m->avctx = avctx; for (substr = 0; substr < MAX_SUBSTREAMS; substr++) m->substream[substr].lossless_check_data = 0xffffffff; - ff_dsputil_init(&m->dsp, avctx); + ff_mlpdsp_init(&m->dsp); avcodec_get_frame_defaults(&m->frame); avctx->coded_frame = &m->frame; |