diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-09-30 03:06:25 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-04 17:41:34 +0200 |
| commit | 7cea36f183b8bb9a28a71f3085a19e4f23614984 (patch) | |
| tree | 215827107d812fc97acb57b73c843493033c0224 /libavcodec | |
| parent | b0c1473f6ea992e1c533f9a005c654228d9a0bda (diff) | |
| download | ffmpeg-7cea36f183b8bb9a28a71f3085a19e4f23614984.tar.gz | |
avcodec/mpeg12: Inline ff_mpeg12_common_init() into mpeg12enc.c
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg12.c | 9 | ||||
| -rw-r--r-- | libavcodec/mpeg12.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpeg12enc.c | 4 |
3 files changed, 3 insertions, 12 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index d78e25a777..7f2aaea7c0 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -36,7 +36,6 @@ #include "mpeg12.h" #include "mpeg12data.h" #include "mpeg12dec.h" -#include "mpegvideodata.h" #include "startcode.h" static const uint8_t table_mb_ptype[7][2] = { @@ -100,14 +99,6 @@ av_cold void ff_init_2d_vlc_rl(RLTable *rl, unsigned static_size, int flags) } } -av_cold void ff_mpeg12_common_init(MpegEncContext *s) -{ - - s->y_dc_scale_table = - s->c_dc_scale_table = ff_mpeg2_dc_scale_table[s->intra_dc_precision]; - -} - void ff_mpeg1_clean_buffers(MpegEncContext *s) { s->last_dc[0] = 1 << (7 + s->intra_dc_precision); diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index e0406b32d9..b323728a33 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -34,8 +34,6 @@ #define EXT_START_CODE 0x000001b5 #define USER_START_CODE 0x000001b2 -void ff_mpeg12_common_init(MpegEncContext *s); - void ff_mpeg1_clean_buffers(MpegEncContext *s); #if FF_API_FLAG_TRUNCATED int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s); diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index f636afe42d..01cfd1c1fa 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -46,6 +46,7 @@ #include "mpeg12vlc.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodata.h" #include "mpegvideoenc.h" #include "profiles.h" @@ -1133,7 +1134,8 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) { static AVOnce init_static_once = AV_ONCE_INIT; - ff_mpeg12_common_init(s); + s->y_dc_scale_table = + s->c_dc_scale_table = ff_mpeg2_dc_scale_table[s->intra_dc_precision]; s->me.mv_penalty = mv_penalty; s->fcode_tab = fcode_tab; |