diff options
| author | Paul B Mahol <onemda@gmail.com> | 2022-02-26 19:09:09 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2022-03-06 12:45:59 +0100 |
| commit | 93dfb6afddb278218da7f8c696bf35ede2ba05aa (patch) | |
| tree | 2dcbbb2aa4d2f54928c3d3c7c6b9de969e237974 | |
| parent | c444d7fafafc59ac0f5a858a43aec6d243129bd6 (diff) | |
| download | ffmpeg-93dfb6afddb278218da7f8c696bf35ede2ba05aa.tar.gz | |
avformat/mpegtsenc: fix muxing pcm-bluray
| -rw-r--r-- | libavformat/mpegtsenc.c | 4 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 971b3f55d8..20dce56122 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -2097,6 +2097,10 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) ts_st->dvb_ac3_desc = dvb_ac3_desc; } av_free(hdr); + } else if (st->codecpar->codec_id == AV_CODEC_ID_PCM_BLURAY && ts->m2ts_mode) { + mpegts_write_pes(s, st, buf, size, pts, dts, + pkt->flags & AV_PKT_FLAG_KEY, stream_id); + return 0; } if (ts_st->payload_size && (ts_st->payload_size + size > ts->pes_payload_size || diff --git a/libavformat/version.h b/libavformat/version.h index 26234573b8..05688e33ad 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -33,7 +33,7 @@ // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 #define LIBAVFORMAT_VERSION_MINOR 17 -#define LIBAVFORMAT_VERSION_MICRO 102 +#define LIBAVFORMAT_VERSION_MICRO 103 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |