mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
avcodec/mpeg12: Inline ff_mpeg12_common_init() into mpeg12enc.c
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
b0c1473f6e
commit
7cea36f183
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user