[FFmpeg-devel] [PATCH 15/17] avcodec/mpeg12data: Remove ff_rl_mpeg1
Andreas Rheinhardt
andreas.rheinhardt at outlook.com
Sun Oct 23 22:36:08 EEST 2022
No longer used anywhere.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
libavcodec/mpeg12.c | 1 +
libavcodec/mpeg12data.c | 8 --------
libavcodec/mpeg12vlc.h | 3 ---
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index b0e638bfcd..5d5f39388f 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -37,6 +37,7 @@
#include "mpeg12codecs.h"
#include "mpeg12data.h"
#include "mpeg12dec.h"
+#include "rl.h"
#include "startcode.h"
static const uint8_t table_mb_ptype[7][2] = {
diff --git a/libavcodec/mpeg12data.c b/libavcodec/mpeg12data.c
index 1e3410bf2f..a55fa463a4 100644
--- a/libavcodec/mpeg12data.c
+++ b/libavcodec/mpeg12data.c
@@ -164,14 +164,6 @@ const int8_t ff_mpeg12_run[MPEG12_RL_NB_ELEMS] = {
25, 26, 27, 28, 29, 30, 31,
};
-RLTable ff_rl_mpeg1 = {
- 111,
- 111,
- ff_mpeg1_vlc_table,
- ff_mpeg12_run,
- ff_mpeg12_level,
-};
-
const uint8_t ff_mpeg12_mbAddrIncrTable[36][2] = {
{0x1, 1},
{0x3, 3},
diff --git a/libavcodec/mpeg12vlc.h b/libavcodec/mpeg12vlc.h
index 15275c5269..3ed35968f6 100644
--- a/libavcodec/mpeg12vlc.h
+++ b/libavcodec/mpeg12vlc.h
@@ -28,7 +28,6 @@
#ifndef AVCODEC_MPEG12VLC_H
#define AVCODEC_MPEG12VLC_H
-#include "rl.h"
#include "vlc.h"
#define DC_VLC_BITS 9
@@ -52,8 +51,6 @@ void ff_mpeg12_init_vlcs(void);
#define MPEG12_RL_NB_ELEMS 111
-extern RLTable ff_rl_mpeg1;
-
extern const int8_t ff_mpeg12_level[MPEG12_RL_NB_ELEMS];
extern const int8_t ff_mpeg12_run[MPEG12_RL_NB_ELEMS];
--
2.34.1
More information about the ffmpeg-devel
mailing list