diff options
| author | Steven Liu <lq@chinaffmpeg.org> | 2023-08-04 10:42:16 +0800 |
|---|---|---|
| committer | Steven Liu <liuqi05@kuaishou.com> | 2023-08-14 14:14:07 +0800 |
| commit | ab88970fbacf4165f136d746ca7385c61c6cc41a (patch) | |
| tree | 234a0d2d6381f4bd0936f1ad20894853658c6766 /libavformat | |
| parent | 176ed008bd0f8c6ec7f0474b6503680e7ea6c451 (diff) | |
| download | ffmpeg-ab88970fbacf4165f136d746ca7385c61c6cc41a.tar.gz | |
avformat/flvdec: remove unused context member of flv
The exheader is unnecessary after 207e9f4e505d969d6ff7545b449295a1b88d6d1c
Iust use local varible can do the same function.
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/flvdec.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index bdcf96b4ae..e25b5bd163 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -80,7 +80,6 @@ typedef struct FLVContext { int64_t time_offset; int64_t time_pos; - uint8_t exheader; } FLVContext; /* AMF date type */ @@ -813,7 +812,6 @@ static int flv_read_header(AVFormatContext *s) s->start_time = 0; flv->sum_flv_tag_size = 0; flv->last_keyframe_stream_index = -1; - flv->exheader = 0; return 0; } @@ -1043,6 +1041,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) AVStream *st = NULL; int last = -1; int orig_size; + int enhanced_flv = 0; uint32_t video_codec_id = 0; retry: @@ -1095,9 +1094,9 @@ retry: * Reference Enhancing FLV 2023-03-v1.0.0-B.8 * https://github.com/veovera/enhanced-rtmp/blob/main/enhanced-rtmp-v1.pdf * */ - flv->exheader = (flags >> 7) & 1; + enhanced_flv = (flags >> 7) & 1; size--; - if (flv->exheader) { + if (enhanced_flv) { video_codec_id = avio_rb32(s->pb); size -= 4; } @@ -1276,7 +1275,7 @@ retry_duration: st->codecpar->codec_id == AV_CODEC_ID_AV1 || st->codecpar->codec_id == AV_CODEC_ID_VP9) { int type = 0; - if (flv->exheader && stream_type == FLV_STREAM_TYPE_VIDEO) { + if (enhanced_flv && stream_type == FLV_STREAM_TYPE_VIDEO) { type = flags & 0x0F; } else { type = avio_r8(s->pb); |