Unified · Split
| @@ -1744,24 +1744,24 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) · 1743 unmodified lines | ||
| 1744 | 1744 | av_log(s, AV_LOG_ERROR, "AAC bitstream not in ADTS format " |
| 1745 | 1745 | "and extradata missing\n"); |
| 1746 | 1746 | } else { |
| 1747 | − av_init_packet(&pkt2); | |
| 1748 | − pkt2.data = pkt->data; | |
| 1749 | − pkt2.size = pkt->size; | |
| 1750 | − av_assert0(pkt->dts != AV_NOPTS_VALUE); | |
| 1751 | − pkt2.dts = av_rescale_q(pkt->dts, st->time_base, ts_st->amux->streams[0]->time_base); | |
| 1752 | − | |
| 1753 | − ret = avio_open_dyn_buf(&ts_st->amux->pb); | |
| 1754 | − if (ret < 0) | |
| 1755 | − return ret; | |
| 1756 | − | |
| 1757 | − ret = av_write_frame(ts_st->amux, &pkt2); | |
| 1758 | − if (ret < 0) { | |
| 1759 | − ffio_free_dyn_buf(&ts_st->amux->pb); | |
| 1760 | − return ret; | |
| 1761 | − } | |
| 1762 | − size = avio_close_dyn_buf(ts_st->amux->pb, &data); | |
| 1763 | − ts_st->amux->pb = NULL; | |
| 1764 | − buf = data; | |
| 1747 | + av_init_packet(&pkt2); | |
| 1748 | + pkt2.data = pkt->data; | |
| 1749 | + pkt2.size = pkt->size; | |
| 1750 | + av_assert0(pkt->dts != AV_NOPTS_VALUE); | |
| 1751 | + pkt2.dts = av_rescale_q(pkt->dts, st->time_base, ts_st->amux->streams[0]->time_base); | |
| 1752 | + | |
| 1753 | + ret = avio_open_dyn_buf(&ts_st->amux->pb); | |
| 1754 | + if (ret < 0) | |
| 1755 | + return ret; | |
| 1756 | + | |
| 1757 | + ret = av_write_frame(ts_st->amux, &pkt2); | |
| 1758 | + if (ret < 0) { | |
| 1759 | + ffio_free_dyn_buf(&ts_st->amux->pb); | |
| 1760 | + return ret; | |
| 1761 | + } | |
| 1762 | + size = avio_close_dyn_buf(ts_st->amux->pb, &data); | |
| 1763 | + ts_st->amux->pb = NULL; | |
| 1764 | + buf = data; | |
| 1765 | 1765 | } |
| 1766 | 1766 | } |
| 1767 | 1767 | } else if (st->codecpar->codec_id == AV_CODEC_ID_HEVC) { |