virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avformat/dhav: Remove end_ prefix from variable names

Browse Source 
The end_ prefix is confusing and may have contributed the mixup
fixed in the previous commit

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2025-07-28 15:38:11 +02:00
parent 33ae6cda71
commit a408b74977
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libavformat/dhav.c
View File

@ -241,12 +241,12 @@ static int64_t get_duration(AVFormatContext *s)
return 0; return 0;
int64_t start_pos = avio_tell(s->pb); int64_t start_pos = avio_tell(s->pb);
int64_t end_pos = -1; int64_t pos = -1;
int64_t start = 0, end = 0; int64_t start = 0, end = 0;
struct tm timeinfo; struct tm timeinfo;
uint8_t *end_buffer; uint8_t *buffer;
int64_t end_buffer_size; int64_t buffer_size;
int64_t end_buffer_pos; int64_t buffer_pos;
int64_t offset; int64_t offset;
unsigned date; unsigned date;
int64_t size = avio_size(s->pb); int64_t size = avio_size(s->pb);
@ -259,40 +259,40 @@ static int64_t get_duration(AVFormatContext *s)
get_timeinfo(date, &timeinfo); get_timeinfo(date, &timeinfo);
start = av_timegm(&timeinfo) * 1000LL; start = av_timegm(&timeinfo) * 1000LL;
end_buffer_size = FFMIN(MAX_DURATION_BUFFER_SIZE, size); buffer_size = FFMIN(MAX_DURATION_BUFFER_SIZE, size);
end_buffer = av_malloc(end_buffer_size); buffer = av_malloc(buffer_size);
if (!end_buffer) if (!buffer)
goto fail; goto fail;
end_buffer_pos = size - end_buffer_size; buffer_pos = size - buffer_size;
avio_seek(s->pb, end_buffer_pos, SEEK_SET); avio_seek(s->pb, buffer_pos, SEEK_SET);
if (ffio_read_size(s->pb, end_buffer, end_buffer_size) < 0) if (ffio_read_size(s->pb, buffer, buffer_size) < 0)
goto fail; goto fail;
offset = end_buffer_size - 8; offset = buffer_size - 8;
while (offset > 0) { while (offset > 0) {
if (AV_RL32(end_buffer + offset) == MKTAG('d','h','a','v')) { if (AV_RL32(buffer + offset) == MKTAG('d','h','a','v')) {
int64_t seek_back = AV_RL32(end_buffer + offset + 4); int64_t seek_back = AV_RL32(buffer + offset + 4);
end_pos = end_buffer_pos + offset - seek_back + 8; pos = buffer_pos + offset - seek_back + 8;
break; break;
} else { } else {
offset -= 9; offset -= 9;
} }
} }
if (end_pos < end_buffer_pos || end_pos + 16 > end_buffer_pos + end_buffer_size) if (pos < buffer_pos || pos + 16 > buffer_pos + buffer_size)
goto fail; goto fail;
date = AV_RL32(end_buffer + (end_pos - end_buffer_pos) + 16); date = AV_RL32(buffer + (pos - buffer_pos) + 16);
get_timeinfo(date, &timeinfo); get_timeinfo(date, &timeinfo);
end = av_timegm(&timeinfo) * 1000LL; end = av_timegm(&timeinfo) * 1000LL;
av_freep(&end_buffer); av_freep(&buffer);
avio_seek(s->pb, start_pos, SEEK_SET); avio_seek(s->pb, start_pos, SEEK_SET);
return end - start; return end - start;
fail: fail:
av_freep(&end_buffer); av_freep(&buffer);
avio_seek(s->pb, start_pos, SEEK_SET); avio_seek(s->pb, start_pos, SEEK_SET);
return 0; return 0;
} }