Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
6ed9fc44
Commit
6ed9fc44
authored
Jan 26, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
svq1: replace struct svq1_frame_size with an array.
It is used as an array in svq1enc, so this is more correct.
parent
99162f8d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
9 deletions
+4
-9
svq1.c
libavcodec/svq1.c
+1
-1
svq1.h
libavcodec/svq1.h
+1
-6
svq1dec.c
libavcodec/svq1dec.c
+2
-2
No files found.
libavcodec/svq1.c
View file @
6ed9fc44
...
...
@@ -37,7 +37,7 @@
#include "svq1_vlc.h"
/* standard video sizes */
const
struct
svq1_frame_size
ff_svq1_frame_size_table
[
7
]
=
{
const
uint16_t
ff_svq1_frame_size_table
[
7
][
2
]
=
{
{
160
,
120
},
{
128
,
96
},
{
176
,
144
},
{
352
,
288
},
{
704
,
576
},
{
240
,
180
},
{
320
,
240
}
};
libavcodec/svq1.h
View file @
6ed9fc44
...
...
@@ -42,11 +42,6 @@
#define SVQ1_BLOCK_INTER_4V 2
#define SVQ1_BLOCK_INTRA 3
struct
svq1_frame_size
{
uint16_t
width
;
uint16_t
height
;
};
uint16_t
ff_svq1_packet_checksum
(
const
uint8_t
*
data
,
const
int
length
,
int
value
);
...
...
@@ -59,6 +54,6 @@ extern const uint8_t ff_svq1_inter_multistage_vlc[6][8][2];
extern
const
uint16_t
ff_svq1_intra_mean_vlc
[
256
][
2
];
extern
const
uint16_t
ff_svq1_inter_mean_vlc
[
512
][
2
];
extern
const
struct
svq1_frame_size
ff_svq1_frame_size_table
[
7
];
extern
const
uint16_t
ff_svq1_frame_size_table
[
7
][
2
];
#endif
/* AVCODEC_SVQ1_H */
libavcodec/svq1dec.c
View file @
6ed9fc44
...
...
@@ -579,8 +579,8 @@ static int svq1_decode_frame_header(AVCodecContext *avctx, AVFrame *frame)
return
AVERROR_INVALIDDATA
;
}
else
{
/* get width, height from table */
s
->
width
=
ff_svq1_frame_size_table
[
frame_size_code
]
.
width
;
s
->
height
=
ff_svq1_frame_size_table
[
frame_size_code
]
.
height
;
s
->
width
=
ff_svq1_frame_size_table
[
frame_size_code
]
[
0
]
;
s
->
height
=
ff_svq1_frame_size_table
[
frame_size_code
]
[
1
]
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment