mirror of
https://github.com/jellyfin/jellyfin-ffmpeg.git
synced 2026-09-03 05:09:58 +03:00
New upstream version 5.0.1
This commit is contained in:
@@ -37,7 +37,7 @@
|
||||
#include "dirac_arith.h"
|
||||
#include "dirac_vlc.h"
|
||||
#include "mpeg12data.h"
|
||||
#include "libavcodec/mpegvideo.h"
|
||||
#include "mpegpicture.h"
|
||||
#include "mpegvideoencdsp.h"
|
||||
#include "dirac_dwt.h"
|
||||
#include "dirac.h"
|
||||
@@ -304,7 +304,7 @@ static int alloc_sequence_buffers(DiracContext *s)
|
||||
w = FFALIGN(CALC_PADDING(w, MAX_DWT_LEVELS), 8); /* FIXME: Should this be 16 for SSE??? */
|
||||
h = top_padding + CALC_PADDING(h, MAX_DWT_LEVELS) + max_yblen/2;
|
||||
|
||||
s->plane[i].idwt.buf_base = av_mallocz_array((w+max_xblen), h * (2 << s->pshift));
|
||||
s->plane[i].idwt.buf_base = av_calloc(w + max_xblen, h * (2 << s->pshift));
|
||||
s->plane[i].idwt.tmp = av_malloc_array((w+16), 2 << s->pshift);
|
||||
s->plane[i].idwt.buf = s->plane[i].idwt.buf_base + (top_padding*w)*(2 << s->pshift);
|
||||
if (!s->plane[i].idwt.buf_base || !s->plane[i].idwt.tmp)
|
||||
@@ -2355,7 +2355,7 @@ static int dirac_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
|
||||
return buf_idx;
|
||||
}
|
||||
|
||||
AVCodec ff_dirac_decoder = {
|
||||
const AVCodec ff_dirac_decoder = {
|
||||
.name = "dirac",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("BBC Dirac VC-2"),
|
||||
.type = AVMEDIA_TYPE_VIDEO,
|
||||
|
||||
Reference in New Issue
Block a user