Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-11-08 02:15:46 +0300
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-11-11 14:24:23 +0300
commite2d397a9ef6433304f8cbbe98cd89cd222059806 (patch)
tree0af7c0c6ffecd135de9be89f359c1ca7400a23da
parentf56ca21dd4a8061875ac736356ac142bb3163e3b (diff)
avcodec/mpeg4data: Move ff_mpeg4_resync_prefix to its only user
This array is only ever useful to a decoder. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/mpeg4data.h4
-rw-r--r--libavcodec/mpeg4videodata.h1
-rw-r--r--libavcodec/mpeg4videodec.c6
3 files changed, 5 insertions, 6 deletions
diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h
index c5a2b14721..d3ba947f43 100644
--- a/libavcodec/mpeg4data.h
+++ b/libavcodec/mpeg4data.h
@@ -362,10 +362,6 @@ const uint8_t ff_mpeg4_c_dc_scale_table[32]={
0, 8, 8, 8, 8, 9, 9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18,19,20,21,22,23,24,25
};
-const uint16_t ff_mpeg4_resync_prefix[8]={
- 0x7F00, 0x7E00, 0x7C00, 0x7800, 0x7000, 0x6000, 0x4000, 0x0000
-};
-
const uint8_t ff_mpeg4_dc_threshold[8]={
99, 13, 15, 17, 19, 21, 23, 0
};
diff --git a/libavcodec/mpeg4videodata.h b/libavcodec/mpeg4videodata.h
index b20096067a..8aac8a2255 100644
--- a/libavcodec/mpeg4videodata.h
+++ b/libavcodec/mpeg4videodata.h
@@ -50,7 +50,6 @@ extern const int16_t ff_mpeg4_default_non_intra_matrix[64];
extern const uint8_t ff_mpeg4_y_dc_scale_table[32];
extern const uint8_t ff_mpeg4_c_dc_scale_table[32];
-extern const uint16_t ff_mpeg4_resync_prefix[8];
extern const uint8_t ff_mpeg4_dc_threshold[8];
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index f91d2753f9..0a100d2064 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -391,7 +391,11 @@ static inline int mpeg4_is_resync(Mpeg4DecContext *ctx)
if (v == 0x7F)
return s->mb_num;
} else {
- if (v == ff_mpeg4_resync_prefix[bits_count & 7]) {
+ static const uint16_t mpeg4_resync_prefix[8] = {
+ 0x7F00, 0x7E00, 0x7C00, 0x7800, 0x7000, 0x6000, 0x4000, 0x0000
+ };
+
+ if (v == mpeg4_resync_prefix[bits_count & 7]) {
int len, mb_num;
int mb_num_bits = av_log2(s->mb_num - 1) + 1;
GetBitContext gb = s->gb;