Unified · Split
| @@ -717,7 +717,7 @@ static int flv_data_packet(AVFormatContext *s, AVPacket *pkt, · 716 unmodified lines | |||
| 717 | if (i == s->nb_streams) { | 717 | if (i == s->nb_streams) { |
| 718 | st = create_stream(s, AVMEDIA_TYPE_DATA); | 718 | st = create_stream(s, AVMEDIA_TYPE_DATA); |
| 719 | if (!st) | 719 | if (!st) |
| 720 | return AVERROR_INVALIDDATA; | 720 | return AVERROR(ENOMEM); |
| 721 | st->codec->codec_id = AV_CODEC_ID_TEXT; | 721 | st->codec->codec_id = AV_CODEC_ID_TEXT; |
| 722 | } | 722 | } |
| 723 | 723 | ||
| @@ -817,9 +817,12 @@ skip: · 93 unmodified lines | |||
| 817 | break; | 817 | break; |
| 818 | } | 818 | } |
| 819 | } | 819 | } |
| 820 | if (i == s->nb_streams) | 820 | if (i == s->nb_streams) { |
| 821 | st = create_stream(s, is_audio ? AVMEDIA_TYPE_AUDIO | 821 | st = create_stream(s, is_audio ? AVMEDIA_TYPE_AUDIO |
| 822 | : AVMEDIA_TYPE_VIDEO); | 822 | : AVMEDIA_TYPE_VIDEO); |
| 823 | if (!st) | ||
| 824 | return AVERROR(ENOMEM); | ||
| 825 | } | ||
| 823 | av_dlog(s, "%d %X %d \n", is_audio, flags, st->discard); | 826 | av_dlog(s, "%d %X %d \n", is_audio, flags, st->discard); |
| 824 | 827 | ||
| 825 | if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || | 828 | if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || |