lavf/matroskaenc: enable PGS merge auto bsf

PGS segments must be merged to one packet for muxing to mkv

John Stebbins committed 6 years ago

Commit 7f5b5771 parent 326f9fd2 files · +4 −1Browse files

Unified · Split

2 files

configure +1 −1
libavformat/matroskaenc.c +3 −0

configure+1−1

@@ -3435,7 +3435,7 @@ latm_muxer_select="aac_adtstoasc_bsf mpeg4audio" · 3434 unmodified lines
3435	3435	matroska_audio_muxer_select="matroska_muxer"
3436	3436	matroska_demuxer_select="riffdec"
3437	3437	matroska_demuxer_suggest="bzlib zlib"
3438		−matroska_muxer_select="mpeg4audio riffenc vp9_superframe_bsf aac_adtstoasc_bsf"
	3438	+matroska_muxer_select="mpeg4audio riffenc aac_adtstoasc_bsf pgs_frame_merge_bsf vp9_superframe_bsf"
3439	3439	mlp_demuxer_select="mlp_parser"
3440	3440	mmf_muxer_select="riffenc"
3441	3441	mov_demuxer_select="iso_media riffdec"

libavformat/matroskaenc.c+3−0

@@ -3172,6 +3172,9 @@ static int mkv_check_bitstream(AVFormatContext s, AVStream st, · 3171 unmodified lines
3172	3172	ret = ff_stream_add_bitstream_filter(st, "aac_adtstoasc", NULL);
3173	3173	} else if (st->codecpar->codec_id == AV_CODEC_ID_VP9) {
3174	3174	ret = ff_stream_add_bitstream_filter(st, "vp9_superframe", NULL);
	3175	+ } else if (CONFIG_MATROSKA_MUXER &&
	3176	+ st->codecpar->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE) {
	3177	+ ret = ff_stream_add_bitstream_filter(st, "pgs_frame_merge", NULL);
3175	3178	}
3176	3179
3177	3180	return ret;