diff mbox series

[FFmpeg-devel,2/4] lavf/matroskaenc: add PGS merge to auto bsf list

Message ID 20200418142547.21299-3-jstebbins@jetheaddev.com
State New
Headers show
Series [FFmpeg-devel,1/4] lavc/pgs_frame_merge_bsf: add bsf to merge PGS segments
Related show

Checks

Context Check Description
andriy/default pending
andriy/configure warning Failed to apply patch

Commit Message

John Stebbins April 18, 2020, 2:25 p.m. UTC
PGS segments must be merged to one packet for muxing to mkv
---
 libavformat/matroskaenc.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Andreas Rheinhardt May 2, 2020, 8:40 p.m. UTC | #1
John Stebbins:
> PGS segments must be merged to one packet for muxing to mkv
> ---
>  libavformat/matroskaenc.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
> index d3256d8f5d..bccf8b11d2 100644
> --- a/libavformat/matroskaenc.c
> +++ b/libavformat/matroskaenc.c
> @@ -2655,6 +2655,8 @@ static int mkv_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt)
>              ret = ff_stream_add_bitstream_filter(st, "aac_adtstoasc", NULL);
>      } else if (st->codecpar->codec_id == AV_CODEC_ID_VP9) {
>          ret = ff_stream_add_bitstream_filter(st, "vp9_superframe", NULL);
> +    } else if (st->codecpar->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE) {
> +        ret = ff_stream_add_bitstream_filter(st, "pgs_frame_merge", NULL);
>      }
>  
>      return ret;
> 
1128aa875367f66ac11adc30364d5652919a2591 removed the auto bsf list (no
muxer added more than one bsf for the same stream), so your commit
message needs to be updated.

- Andreas
John Stebbins May 3, 2020, 4:01 p.m. UTC | #2
On Sat, 2020-05-02 at 22:40 +0200, Andreas Rheinhardt wrote:
> John Stebbins:
> > PGS segments must be merged to one packet for muxing to mkv
> > ---
> >  libavformat/matroskaenc.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
> > index d3256d8f5d..bccf8b11d2 100644
> > --- a/libavformat/matroskaenc.c
> > +++ b/libavformat/matroskaenc.c
> > @@ -2655,6 +2655,8 @@ static int mkv_check_bitstream(struct
> > AVFormatContext *s, const AVPacket *pkt)
> >              ret = ff_stream_add_bitstream_filter(st,
> > "aac_adtstoasc", NULL);
> >      } else if (st->codecpar->codec_id == AV_CODEC_ID_VP9) {
> >          ret = ff_stream_add_bitstream_filter(st, "vp9_superframe",
> > NULL);
> > +    } else if (st->codecpar->codec_id ==
> > AV_CODEC_ID_HDMV_PGS_SUBTITLE) {
> > +        ret = ff_stream_add_bitstream_filter(st,
> > "pgs_frame_merge", NULL);
> >      }
> >  
> >      return ret;
> > 
> 1128aa875367f66ac11adc30364d5652919a2591 removed the auto bsf list
> (no
> muxer added more than one bsf for the same stream), so your commit
> message needs to be updated.
> 

Will do
diff mbox series

Patch

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index d3256d8f5d..bccf8b11d2 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2655,6 +2655,8 @@  static int mkv_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt)
             ret = ff_stream_add_bitstream_filter(st, "aac_adtstoasc", NULL);
     } else if (st->codecpar->codec_id == AV_CODEC_ID_VP9) {
         ret = ff_stream_add_bitstream_filter(st, "vp9_superframe", NULL);
+    } else if (st->codecpar->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE) {
+        ret = ff_stream_add_bitstream_filter(st, "pgs_frame_merge", NULL);
     }
 
     return ret;