History

avformat/mpegtsenc: fix muxing pcm-bluray

Paul B Mahol committed 4 years ago

Commit 93dfb6a1 parent c444d7f2 files · +5 −1Browse files

Unified · Split

2 files
  1. libavformat/mpegtsenc.c +4 −0
  2. libavformat/version.h +1 −1
libavformat/mpegtsenc.c+4−0
@@ -2097,6 +2097,10 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) · 2096 unmodified lines
20972097 ts_st->dvb_ac3_desc = dvb_ac3_desc;
20982098 }
20992099 av_free(hdr);
2100+ } else if (st->codecpar->codec_id == AV_CODEC_ID_PCM_BLURAY && ts->m2ts_mode) {
2101+ mpegts_write_pes(s, st, buf, size, pts, dts,
2102+ pkt->flags & AV_PKT_FLAG_KEY, stream_id);
2103+ return 0;
21002104 }
21012105
21022106 if (ts_st->payload_size && (ts_st->payload_size + size > ts->pes_payload_size ||
libavformat/version.h+1−1
@@ -33,7 +33,7 @@ · 32 unmodified lines
3333 // Also please add any ticket numbers that you believe might be affected here
3434 #define LIBAVFORMAT_VERSION_MAJOR 59
3535 #define LIBAVFORMAT_VERSION_MINOR 17
36−#define LIBAVFORMAT_VERSION_MICRO 102
36+#define LIBAVFORMAT_VERSION_MICRO 103
3737
3838 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
3939 LIBAVFORMAT_VERSION_MINOR, \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t