Skip to content

F
ffmpeg.wasm-core
Commit 6a50e8a1 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files
Options

Do not change codec in flv streams if the user has forced a codec. 

Fixes ticket #2218.
parent 5a67e30b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavformat/flvdec.c
View file @ 6a50e8a1
...@@ -713,13 +713,13 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -713,13 +713,13 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
st = s->streams[i]; st = s->streams[i];
if (stream_type == FLV_STREAM_TYPE_AUDIO) { if (stream_type == FLV_STREAM_TYPE_AUDIO) {
if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO &&
flv_same_audio_codec(st->codec, flags)) { (s->audio_codec_id || flv_same_audio_codec(st->codec, flags))) {
break; break;
} }
} else } else
if (stream_type == FLV_STREAM_TYPE_VIDEO) { if (stream_type == FLV_STREAM_TYPE_VIDEO) {
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
flv_same_video_codec(st->codec, flags)) { (s->video_codec_id || flv_same_video_codec(st->codec, flags))) {
break; break;
} }
} else if (stream_type == FLV_STREAM_TYPE_DATA) { } else if (stream_type == FLV_STREAM_TYPE_DATA) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment