|
|
|
@@ -406,17 +406,16 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) |
|
|
|
} |
|
|
|
if (ret < 0) |
|
|
|
return ret; |
|
|
|
/* TODO reindent */ |
|
|
|
if ((ret = match_streams(avf)) < 0) { |
|
|
|
av_packet_unref(pkt); |
|
|
|
return ret; |
|
|
|
} |
|
|
|
cs = &cat->cur_file->streams[pkt->stream_index]; |
|
|
|
if (cs->out_stream_index < 0) { |
|
|
|
av_packet_unref(pkt); |
|
|
|
continue; |
|
|
|
} |
|
|
|
pkt->stream_index = cs->out_stream_index; |
|
|
|
if ((ret = match_streams(avf)) < 0) { |
|
|
|
av_packet_unref(pkt); |
|
|
|
return ret; |
|
|
|
} |
|
|
|
cs = &cat->cur_file->streams[pkt->stream_index]; |
|
|
|
if (cs->out_stream_index < 0) { |
|
|
|
av_packet_unref(pkt); |
|
|
|
continue; |
|
|
|
} |
|
|
|
pkt->stream_index = cs->out_stream_index; |
|
|
|
break; |
|
|
|
} |
|
|
|
|
|
|
|
|