git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d2597fb
)
avcodec/mdec: override IDCT choice before initing DSP structs
author
James Darnley
<jdarnley@obe.tv>
Sat, 17 Jun 2017 01:13:36 +0000
(
03:13
+0200)
committer
James Darnley
<jdarnley@obe.tv>
Tue, 20 Jun 2017 11:59:51 +0000
(13:59 +0200)
libavcodec/mdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mdec.c
b/libavcodec/mdec.c
index
8e28aa0
..
97bfebb
100644
(file)
--- a/
libavcodec/mdec.c
+++ b/
libavcodec/mdec.c
@@
-213,6
+213,9
@@
static av_cold int decode_init(AVCodecContext *avctx)
{
MDECContext * const a = avctx->priv_data;
{
MDECContext * const a = avctx->priv_data;
+ if (avctx->idct_algo == FF_IDCT_AUTO)
+ avctx->idct_algo = FF_IDCT_SIMPLE;
+
a->mb_width = (avctx->coded_width + 15) / 16;
a->mb_height = (avctx->coded_height + 15) / 16;
a->mb_width = (avctx->coded_width + 15) / 16;
a->mb_height = (avctx->coded_height + 15) / 16;
@@
-225,8
+228,6
@@
static av_cold int decode_init(AVCodecContext *avctx)
ff_init_scantable(a->idsp.idct_permutation, &a->scantable,
ff_zigzag_direct);
ff_init_scantable(a->idsp.idct_permutation, &a->scantable,
ff_zigzag_direct);
- if (avctx->idct_algo == FF_IDCT_AUTO)
- avctx->idct_algo = FF_IDCT_SIMPLE;
avctx->pix_fmt = AV_PIX_FMT_YUVJ420P;
avctx->color_range = AVCOL_RANGE_JPEG;
avctx->pix_fmt = AV_PIX_FMT_YUVJ420P;
avctx->color_range = AVCOL_RANGE_JPEG;