diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-02-01 23:27:15 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-02-01 23:27:15 +0100 |
| commit | 6a50e8a190bc1329fd3e76e8497bb7f870b6e69b (patch) | |
| tree | 7fde76246453c03c98ade9999d25500e66f280ee /libavformat/flvdec.c | |
| parent | 5a67e30b1c71dc0a84779b543d95ca20faa8cbed (diff) | |
| download | ffmpeg-6a50e8a190bc1329fd3e76e8497bb7f870b6e69b.tar.gz | |
Do not change codec in flv streams if the user has forced a codec.
Fixes ticket #2218.
Diffstat (limited to 'libavformat/flvdec.c')
| -rw-r--r-- | libavformat/flvdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 09a77c4852..b57929eda1 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -713,13 +713,13 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) st = s->streams[i]; if (stream_type == FLV_STREAM_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; } } else if (stream_type == FLV_STREAM_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; } } else if (stream_type == FLV_STREAM_TYPE_DATA) { |