virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/flvdec: stop shadowing local variables

Browse Source
This commit is contained in:
Timo Rothenpieler
2024-05-20 02:40:14 +02:00
parent f8dc4d94fd
commit da32990e83
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
libavformat/flvdec.c
View File

@@ -1396,8 +1396,8 @@ retry:
if (enhanced_flv && (flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) { if (enhanced_flv && (flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) {
if (pkt_type == PacketTypeMetadata) { if (pkt_type == PacketTypeMetadata) {
int ret = flv_parse_video_color_info(s, st, next); int sret = flv_parse_video_color_info(s, st, next);
av_log(s, AV_LOG_DEBUG, "enhanced flv parse metadata ret %d and skip\n", ret); av_log(s, AV_LOG_DEBUG, "enhanced flv parse metadata ret %d and skip\n", sret);
} }
goto skip; goto skip;
} else if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) { } else if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) {
@@ -1500,25 +1500,25 @@ skip:
if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) &&
(!s->duration || s->duration == AV_NOPTS_VALUE) && (!s->duration || s->duration == AV_NOPTS_VALUE) &&
!flv->searched_for_end) { !flv->searched_for_end) {
int size; int final_size;
const int64_t pos = avio_tell(s->pb); const int64_t pos = avio_tell(s->pb);
// Read the last 4 bytes of the file, this should be the size of the // Read the last 4 bytes of the file, this should be the size of the
// previous FLV tag. Use the timestamp of its payload as duration. // previous FLV tag. Use the timestamp of its payload as duration.
int64_t fsize = avio_size(s->pb); int64_t fsize = avio_size(s->pb);
retry_duration: retry_duration:
avio_seek(s->pb, fsize - 4, SEEK_SET); avio_seek(s->pb, fsize - 4, SEEK_SET);
size = avio_rb32(s->pb); final_size = avio_rb32(s->pb);
if (size > 0 && size < fsize) { if (final_size > 0 && final_size < fsize) {
// Seek to the start of the last FLV tag at position (fsize - 4 - size) // Seek to the start of the last FLV tag at position (fsize - 4 - final_size)
// but skip the byte indicating the type. // but skip the byte indicating the type.
avio_seek(s->pb, fsize - 3 - size, SEEK_SET); avio_seek(s->pb, fsize - 3 - final_size, SEEK_SET);
if (size == avio_rb24(s->pb) + 11) { if (final_size == avio_rb24(s->pb) + 11) {
uint32_t ts = avio_rb24(s->pb); uint32_t ts = avio_rb24(s->pb);
ts |= (unsigned)avio_r8(s->pb) << 24; ts |= (unsigned)avio_r8(s->pb) << 24;
if (ts) if (ts)
s->duration = ts * (int64_t)AV_TIME_BASE / 1000; s->duration = ts * (int64_t)AV_TIME_BASE / 1000;
else if (fsize >= 8 && fsize - 8 >= size) { else if (fsize >= 8 && fsize - 8 >= final_size) {
fsize -= size+4; fsize -= final_size+4;
goto retry_duration; goto retry_duration;
} }
} }
@@ -1612,10 +1612,10 @@ retry_duration:
goto leave; goto leave;
} }
} else if (stream_type == FLV_STREAM_TYPE_VIDEO) { } else if (stream_type == FLV_STREAM_TYPE_VIDEO) {
int ret = flv_set_video_codec(s, st, codec_id, 1); int sret = flv_set_video_codec(s, st, codec_id, 1);
if (ret < 0) if (sret < 0)
return ret; return sret;
size -= ret; size -= sret;
} else if (stream_type == FLV_STREAM_TYPE_SUBTITLE) { } else if (stream_type == FLV_STREAM_TYPE_SUBTITLE) {
st->codecpar->codec_id = AV_CODEC_ID_TEXT; st->codecpar->codec_id = AV_CODEC_ID_TEXT;
} else if (stream_type == FLV_STREAM_TYPE_DATA) { } else if (stream_type == FLV_STREAM_TYPE_DATA) {
@@ -1705,20 +1705,20 @@ retry_duration:
pkt->stream_index = st->index; pkt->stream_index = st->index;
pkt->pos = pos; pkt->pos = pos;
if (!multitrack && flv->new_extradata[stream_type]) { if (!multitrack && flv->new_extradata[stream_type]) {
int ret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, int sret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA,
flv->new_extradata[stream_type], flv->new_extradata[stream_type],
flv->new_extradata_size[stream_type]); flv->new_extradata_size[stream_type]);
if (ret >= 0) { if (sret >= 0) {
flv->new_extradata[stream_type] = NULL; flv->new_extradata[stream_type] = NULL;
flv->new_extradata_size[stream_type] = 0; flv->new_extradata_size[stream_type] = 0;
} }
} else if (multitrack && } else if (multitrack &&
flv->mt_extradata_cnt > track_idx && flv->mt_extradata_cnt > track_idx &&
flv->mt_extradata[track_idx]) { flv->mt_extradata[track_idx]) {
int ret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, int sret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA,
flv->mt_extradata[track_idx], flv->mt_extradata[track_idx],
flv->mt_extradata_sz[track_idx]); flv->mt_extradata_sz[track_idx]);
if (ret >= 0) { if (sret >= 0) {
flv->mt_extradata[track_idx] = NULL; flv->mt_extradata[track_idx] = NULL;
flv->mt_extradata_sz[track_idx] = 0; flv->mt_extradata_sz[track_idx] = 0;
} }