virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/mpeg4video: Nuke ff_mpeg4_init_rl_intra()

Browse Source 
The MPEG-4 decoder can now initialize ff_mpeg4_rl_intra
directly given that the MPEG-4 encoder no longer wants
it performed, too.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-05-18 08:59:27 +02:00
parent d75a398d00
commit 2a59cb0c82
3 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/mpeg4video.c
View File

@ -20,25 +20,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/thread.h"
#include "mpegutils.h" #include "mpegutils.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "mpeg4video.h" #include "mpeg4video.h"
#include "mpeg4data.h" #include "mpeg4data.h"
static av_cold void mpeg4_init_rl_intra(void)
{
static uint8_t mpeg4_rl_intra_table[2][2 * MAX_RUN + MAX_LEVEL + 3];
ff_rl_init(&ff_mpeg4_rl_intra, mpeg4_rl_intra_table);
}
av_cold void ff_mpeg4_init_rl_intra(void)
{
static AVOnce init_static_once = AV_ONCE_INIT;
ff_thread_once(&init_static_once, mpeg4_init_rl_intra);
}
int ff_mpeg4_get_video_packet_prefix_length(enum AVPictureType pict_type, int ff_mpeg4_get_video_packet_prefix_length(enum AVPictureType pict_type,
int f_code, int b_code) int f_code, int b_code)
{ {

1
libavcodec/mpeg4videodata.h
View File

@ -35,7 +35,6 @@ extern const int8_t ff_mpeg4_intra_level[102];
extern const int8_t ff_mpeg4_intra_run[102]; extern const int8_t ff_mpeg4_intra_run[102];
extern RLTable ff_mpeg4_rl_intra; extern RLTable ff_mpeg4_rl_intra;
void ff_mpeg4_init_rl_intra(void);
/* Note this is identical to the intra rvlc except that it is reordered. */ /* Note this is identical to the intra rvlc except that it is reordered. */
extern RLTable ff_rvlc_rl_inter; extern RLTable ff_rvlc_rl_inter;

4
libavcodec/mpeg4videodec.c
View File

@ -3922,7 +3922,9 @@ static av_cold void mpeg4_init_static(void)
0, 0); 0, 0);
} }
ff_mpeg4_init_rl_intra(); static uint8_t mpeg4_rl_intra_table[2][2 * MAX_RUN + MAX_LEVEL + 3];
ff_rl_init(&ff_mpeg4_rl_intra, mpeg4_rl_intra_table);
INIT_FIRST_VLC_RL(ff_mpeg4_rl_intra, 554); INIT_FIRST_VLC_RL(ff_mpeg4_rl_intra, 554);
VLC_INIT_RL(ff_rvlc_rl_inter, 1072); VLC_INIT_RL(ff_rvlc_rl_inter, 1072);
INIT_FIRST_VLC_RL(ff_rvlc_rl_intra, 1072); INIT_FIRST_VLC_RL(ff_rvlc_rl_intra, 1072);