X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Ftta.c;h=c0162c5849eaa89d78be1135e33b9a6a58c1183f;hb=132adf73af31a1a5a8c7c0798b09f7012d73bd4c;hp=1e2e9c4ef4c44619cfa6d2e9313146ea818d87d1;hpb=543142990b6f7b8757753c13ea6dbc56275c5c7e;p=ffmpeg diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 1e2e9c4ef4c..c0162c5849e 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -27,8 +27,13 @@ * @author Alex Beregszaszi */ -#define BITSTREAM_READER_LE #include + +#include "libavutil/crc.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/opt.h" + +#define BITSTREAM_READER_LE #include "ttadata.h" #include "ttadsp.h" #include "avcodec.h" @@ -36,9 +41,6 @@ #include "thread.h" #include "unary.h" #include "internal.h" -#include "libavutil/crc.h" -#include "libavutil/intreadwrite.h" -#include "libavutil/opt.h" #define FORMAT_SIMPLE 1 #define FORMAT_ENCRYPTED 2 @@ -312,8 +314,8 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data, *p = 1 + ((value >> 1) ^ ((value & 1) - 1)); // run hybrid filter - s->dsp.ttafilter_process_dec(filter->qm, filter->dx, filter->dl, &filter->error, p, - filter->shift, filter->round); + s->dsp.filter_process(filter->qm, filter->dx, filter->dl, &filter->error, p, + filter->shift, filter->round); // fixed order prediction #define PRED(x, k) (int32_t)((((uint64_t)(x) << (k)) - (x)) >> (k))