avformat/av1: reduce the scope of some variables
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
76e10325fc
commit
7a4840a8ca
@ -33,8 +33,7 @@ static int av1_filter_obus(AVIOContext *pb, const uint8_t *buf,
|
|||||||
int size, int *offset)
|
int size, int *offset)
|
||||||
{
|
{
|
||||||
const uint8_t *start = buf, *end = buf + size;
|
const uint8_t *start = buf, *end = buf + size;
|
||||||
int64_t obu_size;
|
int off;
|
||||||
int off, start_pos, type, temporal_id, spatial_id;
|
|
||||||
enum {
|
enum {
|
||||||
START_NOT_FOUND,
|
START_NOT_FOUND,
|
||||||
START_FOUND,
|
START_FOUND,
|
||||||
@ -44,6 +43,8 @@ static int av1_filter_obus(AVIOContext *pb, const uint8_t *buf,
|
|||||||
|
|
||||||
off = size = 0;
|
off = size = 0;
|
||||||
while (buf < end) {
|
while (buf < end) {
|
||||||
|
int64_t obu_size;
|
||||||
|
int start_pos, type, temporal_id, spatial_id;
|
||||||
int len = parse_obu_header(buf, end - buf, &obu_size, &start_pos,
|
int len = parse_obu_header(buf, end - buf, &obu_size, &start_pos,
|
||||||
&type, &temporal_id, &spatial_id);
|
&type, &temporal_id, &spatial_id);
|
||||||
if (len < 0)
|
if (len < 0)
|
||||||
@ -333,8 +334,6 @@ static int parse_sequence_header(AV1SequenceParameters *seq_params, const uint8_
|
|||||||
|
|
||||||
int ff_av1_parse_seq_header(AV1SequenceParameters *seq, const uint8_t *buf, int size)
|
int ff_av1_parse_seq_header(AV1SequenceParameters *seq, const uint8_t *buf, int size)
|
||||||
{
|
{
|
||||||
int64_t obu_size;
|
|
||||||
int start_pos, type, temporal_id, spatial_id;
|
|
||||||
int is_av1c;
|
int is_av1c;
|
||||||
|
|
||||||
if (size <= 0)
|
if (size <= 0)
|
||||||
@ -373,6 +372,8 @@ int ff_av1_parse_seq_header(AV1SequenceParameters *seq, const uint8_t *buf, int
|
|||||||
}
|
}
|
||||||
|
|
||||||
while (size > 0) {
|
while (size > 0) {
|
||||||
|
int64_t obu_size;
|
||||||
|
int start_pos, type, temporal_id, spatial_id;
|
||||||
int len = parse_obu_header(buf, size, &obu_size, &start_pos,
|
int len = parse_obu_header(buf, size, &obu_size, &start_pos,
|
||||||
&type, &temporal_id, &spatial_id);
|
&type, &temporal_id, &spatial_id);
|
||||||
if (len < 0)
|
if (len < 0)
|
||||||
@ -401,8 +402,6 @@ int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size)
|
|||||||
PutBitContext pbc;
|
PutBitContext pbc;
|
||||||
uint8_t header[4], *meta;
|
uint8_t header[4], *meta;
|
||||||
const uint8_t *seq;
|
const uint8_t *seq;
|
||||||
int64_t obu_size;
|
|
||||||
int start_pos, type, temporal_id, spatial_id;
|
|
||||||
int ret, nb_seq = 0, seq_size, meta_size;
|
int ret, nb_seq = 0, seq_size, meta_size;
|
||||||
|
|
||||||
if (size <= 0)
|
if (size <= 0)
|
||||||
@ -427,6 +426,8 @@ int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size)
|
|||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
while (size > 0) {
|
while (size > 0) {
|
||||||
|
int64_t obu_size;
|
||||||
|
int start_pos, type, temporal_id, spatial_id;
|
||||||
int len = parse_obu_header(buf, size, &obu_size, &start_pos,
|
int len = parse_obu_header(buf, size, &obu_size, &start_pos,
|
||||||
&type, &temporal_id, &spatial_id);
|
&type, &temporal_id, &spatial_id);
|
||||||
if (len < 0) {
|
if (len < 0) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user