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

Fixes ticket #2218.
12 years ago · 6a50e8a190
parent 5a67e30b1c
commit 6a50e8a190
1 changed files with 2 additions and 2 deletions
--- 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) {