Unified · Split
| @@ -1275,7 +1275,7 @@ static int flv_update_video_color_info(AVFormatContext *s, AVStream *st) · 1274 unmodified lines | |||
| 1275 | static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) | 1275 | static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) |
| 1276 | { | 1276 | { |
| 1277 | FLVContext *flv = s->priv_data; | 1277 | FLVContext *flv = s->priv_data; |
| 1278 | int ret, i, size, flags; | 1278 | int ret = 0, i, size, flags; |
| 1279 | int res = 0; | 1279 | int res = 0; |
| 1280 | enum FlvTagType type; | 1280 | enum FlvTagType type; |
| 1281 | int stream_type=-1; | 1281 | int stream_type=-1; |
| @@ -1613,7 +1613,7 @@ retry_duration: · 331 unmodified lines | |||
| 1613 | 1613 | ||
| 1614 | av_log(s, AV_LOG_DEBUG, "Set channel data from MultiChannel info.\n"); | 1614 | av_log(s, AV_LOG_DEBUG, "Set channel data from MultiChannel info.\n"); |
| 1615 | 1615 | ||
| 1616 | goto leave; | 1616 | goto next_track; |
| 1617 | } | 1617 | } |
| 1618 | } else if (stream_type == FLV_STREAM_TYPE_VIDEO) { | 1618 | } else if (stream_type == FLV_STREAM_TYPE_VIDEO) { |
| 1619 | int sret = flv_set_video_codec(s, st, codec_id, 1); | 1619 | int sret = flv_set_video_codec(s, st, codec_id, 1); |
| @@ -1759,6 +1759,7 @@ retry_duration: · 139 unmodified lines | |||
| 1759 | return ret; | 1759 | return ret; |
| 1760 | res = FFERROR_REDO; | 1760 | res = FFERROR_REDO; |
| 1761 | 1761 | ||
| 1762 | next_track: | ||
| 1762 | if (track_size) { | 1763 | if (track_size) { |
| 1763 | av_log(s, AV_LOG_WARNING, "Track size mismatch: %d!\n", track_size); | 1764 | av_log(s, AV_LOG_WARNING, "Track size mismatch: %d!\n", track_size); |
| 1764 | avio_skip(s->pb, track_size); | 1765 | avio_skip(s->pb, track_size); |
| @@ -1768,7 +1769,6 @@ retry_duration: · 3 unmodified lines | |||
| 1768 | if (!size) | 1769 | if (!size) |
| 1769 | break; | 1770 | break; |
| 1770 | 1771 | ||
| 1771 | next_track: | ||
| 1772 | if (multitrack_type == MultitrackTypeOneTrack) { | 1772 | if (multitrack_type == MultitrackTypeOneTrack) { |
| 1773 | av_log(s, AV_LOG_ERROR, "Attempted to read next track in single-track mode.\n"); | 1773 | av_log(s, AV_LOG_ERROR, "Attempted to read next track in single-track mode.\n"); |
| 1774 | ret = FFERROR_REDO; | 1774 | ret = FFERROR_REDO; |