[FFmpeg-devel] [PATCHv2] mpegtsenc: Do not fail ADTS AAC muxing if the first frame is not ADTS

Michael Niedermayer michael at niedermayer.cc
Fri Jan 29 23:58:45 CET 2016


On Fri, Jan 29, 2016 at 10:41:14PM +0100, Michael Niedermayer wrote:
> On Thu, Jan 14, 2016 at 07:37:21AM +0100, Hagen Schmidt wrote:
> > On 15/12/15 08:00, Hagen Schmidt wrote:
> > >Fixes ticket 279.
> > >---
> > >  libavformat/mpegtsenc.c | 2 --
> > >  1 file changed, 2 deletions(-)
> > >
> > >diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
> > >index 19032f3..a0dca4a 100644
> > >--- a/libavformat/mpegtsenc.c
> > >+++ b/libavformat/mpegtsenc.c
> > >@@ -1519,8 +1519,6 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
> > >              if (!ts_st->amux) {
> > >                  av_log(s, AV_LOG_ERROR, "AAC bitstream not in ADTS format "
> > >                                          "and extradata missing\n");
> > >-                if (!st->nb_frames)
> > >-                    return AVERROR_INVALIDDATA;
> > >              } else {
> > >              av_init_packet(&pkt2);
> > >              pkt2.data = pkt->data;
> > ping
> 
> applied

btw, if you want you could add a fate test for this
i can add the file to the fate samples if needed


[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

It is what and why we do it that matters, not just one of them.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160129/6bbe714b/attachment.sig>


More information about the ffmpeg-devel mailing list