har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/mpeg12: Inline ff_mpeg12_common_init() into mpeg12enc.c

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-09-30 03:06:25 +02:00
parent b0c1473f6e
commit 7cea36f183
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/mpeg12.c
View File

@ -36,7 +36,6 @@
#include "mpeg12.h" #include "mpeg12.h"
#include "mpeg12data.h" #include "mpeg12data.h"
#include "mpeg12dec.h" #include "mpeg12dec.h"
#include "mpegvideodata.h"
#include "startcode.h" #include "startcode.h"
static const uint8_t table_mb_ptype[7][2] = { 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) void ff_mpeg1_clean_buffers(MpegEncContext *s)
{ {
s->last_dc[0] = 1 << (7 + s->intra_dc_precision); s->last_dc[0] = 1 << (7 + s->intra_dc_precision);

2
libavcodec/mpeg12.h
View File

@ -34,8 +34,6 @@
#define EXT_START_CODE 0x000001b5 #define EXT_START_CODE 0x000001b5
#define USER_START_CODE 0x000001b2 #define USER_START_CODE 0x000001b2
void ff_mpeg12_common_init(MpegEncContext *s);
void ff_mpeg1_clean_buffers(MpegEncContext *s); void ff_mpeg1_clean_buffers(MpegEncContext *s);
#if FF_API_FLAG_TRUNCATED #if FF_API_FLAG_TRUNCATED
int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s); int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s);

4
libavcodec/mpeg12enc.c
View File

@ -46,6 +46,7 @@
#include "mpeg12vlc.h" #include "mpeg12vlc.h"
#include "mpegutils.h" #include "mpegutils.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "mpegvideodata.h"
#include "mpegvideoenc.h" #include "mpegvideoenc.h"
#include "profiles.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; 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->me.mv_penalty = mv_penalty;
s->fcode_tab = fcode_tab; s->fcode_tab = fcode_tab;