Do not change codec in flv streams if the user has forced a codec.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Fri, 1 Feb 2013 22:27:15 +0000 (23:27 +0100)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Fri, 1 Feb 2013 22:42:12 +0000 (23:42 +0100)
Fixes ticket #2218.
(cherry picked from commit 6a50e8a190bc1329fd3e76e8497bb7f870b6e69b)

libavformat/flvdec.c

index 8c6807a..d19cf24 100644 (file)
@@ -712,13 +712,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) {