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: fix potential premature return on audio MultichannelConfig

Browse Source
This commit is contained in:
Timo Rothenpieler
2025-01-07 18:18:02 +01:00
parent e9de794d7f
commit 0ed3446738
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/flvdec.c
View File

@@ -1275,7 +1275,7 @@ static int flv_update_video_color_info(AVFormatContext *s, AVStream *st)
static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
FLVContext *flv = s->priv_data; FLVContext *flv = s->priv_data;
int ret, i, size, flags; int ret = 0, i, size, flags;
int res = 0; int res = 0;
enum FlvTagType type; enum FlvTagType type;
int stream_type=-1; int stream_type=-1;
@@ -1613,7 +1613,7 @@ retry_duration:
av_log(s, AV_LOG_DEBUG, "Set channel data from MultiChannel info.\n"); av_log(s, AV_LOG_DEBUG, "Set channel data from MultiChannel info.\n");
goto leave; goto next_track;
} }
} else if (stream_type == FLV_STREAM_TYPE_VIDEO) { } else if (stream_type == FLV_STREAM_TYPE_VIDEO) {
int sret = flv_set_video_codec(s, st, codec_id, 1); int sret = flv_set_video_codec(s, st, codec_id, 1);
@@ -1759,6 +1759,7 @@ retry_duration:
return ret; return ret;
res = FFERROR_REDO; res = FFERROR_REDO;
next_track:
if (track_size) { if (track_size) {
av_log(s, AV_LOG_WARNING, "Track size mismatch: %d!\n", track_size); av_log(s, AV_LOG_WARNING, "Track size mismatch: %d!\n", track_size);
avio_skip(s->pb, track_size); avio_skip(s->pb, track_size);
@@ -1768,7 +1769,6 @@ retry_duration:
if (!size) if (!size)
break; break;
next_track:
if (multitrack_type == MultitrackTypeOneTrack) { if (multitrack_type == MultitrackTypeOneTrack) {
av_log(s, AV_LOG_ERROR, "Attempted to read next track in single-track mode.\n"); av_log(s, AV_LOG_ERROR, "Attempted to read next track in single-track mode.\n");
ret = FFERROR_REDO; ret = FFERROR_REDO;