mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-18 03:19:31 +02:00
628d02a611
Up until now, the SpeedHQ encoder called a wrong function for init:
void ff_init_uni_ac_vlc(const uint8_t huff_size_ac[256],
uint8_t *uni_ac_vlc_len);
Yet the first argument actually used is of type RLTable; the size of
said struct is less than 256 if the size of a pointer is four, leading
to an access beyond the end of the RLTable.
This commit fixes this by calling the actually intended function:
init_uni_ac_vlc() from mpeg12enc.c. It was intended to use this
function [1], yet doing so was forgotten when the patch was actually
applied.
[1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-July/266187.html
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
78 lines
2.7 KiB
C
78 lines
2.7 KiB
C
/*
|
|
* MPEG-1/2 common code
|
|
* Copyright (c) 2007 Aurelien Jacobs <aurel@gnuage.org>
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef AVCODEC_MPEG12_H
|
|
#define AVCODEC_MPEG12_H
|
|
|
|
#include "mpeg12vlc.h"
|
|
#include "mpegvideo.h"
|
|
|
|
extern uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
|
|
|
|
void ff_mpeg12_common_init(MpegEncContext *s);
|
|
|
|
#define INIT_2D_VLC_RL(rl, static_size, flags)\
|
|
{\
|
|
static RL_VLC_ELEM rl_vlc_table[static_size];\
|
|
rl.rl_vlc[0] = rl_vlc_table;\
|
|
ff_init_2d_vlc_rl(&rl, static_size, flags);\
|
|
}
|
|
|
|
void ff_init_2d_vlc_rl(RLTable *rl, unsigned static_size, int flags);
|
|
void ff_mpeg1_init_uni_ac_vlc(const RLTable *rl, uint8_t *uni_ac_vlc_len);
|
|
|
|
static inline int decode_dc(GetBitContext *gb, int component)
|
|
{
|
|
int code, diff;
|
|
|
|
if (component == 0) {
|
|
code = get_vlc2(gb, ff_dc_lum_vlc.table, DC_VLC_BITS, 2);
|
|
} else {
|
|
code = get_vlc2(gb, ff_dc_chroma_vlc.table, DC_VLC_BITS, 2);
|
|
}
|
|
if (code == 0) {
|
|
diff = 0;
|
|
} else {
|
|
diff = get_xbits(gb, code);
|
|
}
|
|
return diff;
|
|
}
|
|
|
|
int ff_mpeg1_decode_block_intra(GetBitContext *gb,
|
|
const uint16_t *quant_matrix,
|
|
uint8_t *const scantable, int last_dc[3],
|
|
int16_t *block, int index, int qscale);
|
|
|
|
void ff_mpeg1_clean_buffers(MpegEncContext *s);
|
|
int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s);
|
|
|
|
void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number);
|
|
void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[8][64],
|
|
int motion_x, int motion_y);
|
|
void ff_mpeg1_encode_init(MpegEncContext *s);
|
|
void ff_mpeg1_encode_slice_header(MpegEncContext *s);
|
|
|
|
void ff_mpeg12_find_best_frame_rate(AVRational frame_rate,
|
|
int *code, int *ext_n, int *ext_d,
|
|
int nonstandard);
|
|
|
|
#endif /* AVCODEC_MPEG12_H */
|