Hi, On Wed, Apr 13, 2011 at 2:35 AM, Anton Khirnov <[email protected]> wrote: > On Sun, Apr 10, 2011 at 07:42:46AM -0400, Ronald S. Bultje wrote: >> Hi, >> >> On Sun, Apr 10, 2011 at 4:09 AM, Anton Khirnov <[email protected]> wrote: >> > On Sat, Apr 09, 2011 at 08:42:10AM -0400, Ronald S. Bultje wrote: >> >> Hi, >> >> >> >> On Sat, Apr 9, 2011 at 7:50 AM, Reinhard Tartler <[email protected]> >> >> wrote: >> >> > From: Georgi Chorbadzhiyski <[email protected]> >> >> > >> >> > This patch adds support for setting transport_stream_id, >> >> > original_network_id, service_id, pmt_start_pid and start_pid >> >> > in mpegts muxer. >> >> > >> >> > Signed-off-by: Ronald S. Bultje <[email protected]> >> >> > (cherry picked from commit 445996aa51f4f1d9a26456a8511988291a720ba0) >> >> > --- >> >> > libavformat/mpegtsenc.c | 2 +- >> >> > 1 files changed, 1 insertions(+), 1 deletions(-) >> >> > >> >> > diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c >> >> > index 40b906e..66ccfc6 100644 >> >> > --- a/libavformat/mpegtsenc.c >> >> > +++ b/libavformat/mpegtsenc.c >> >> > @@ -421,7 +421,7 @@ static MpegTSService >> >> > *mpegts_add_service(MpegTSWrite *ts, >> >> > service = av_mallocz(sizeof(MpegTSService)); >> >> > if (!service) >> >> > return NULL; >> >> > - service->pmt.pid = ts->pmt_start_pid + ts->nb_services - 1; >> >> > + service->pmt.pid = ts->pmt_start_pid + ts->nb_services; >> >> > service->sid = sid; >> >> > service->provider_name = av_strdup(provider_name); >> >> > service->name = av_strdup(name); >> >> >> >> The commit msg is wrong. I think some commits were mixed up here. The >> >> commit msg should likely read: >> >> >> >> "mpegtsenc: fix setting start_pid, which was off by one." >> >> >> >> Then it's OK, please apply. >> > >> > Actually no, the value in the original patch was wrong and was later >> > fixed in 740ad0d1. This patch would undo the fix. >> >> Are you sure? the dynarray_add() is _below_ the assignment now, so the >> -1 seems unnecessary. > > Hmm, i guess you're right. Then that code was always wrong as this patch > breaks fate.
http://git.libav.org/?p=libav.git;a=commit;h=79dca23dc262742b312161a5dec707eb7b9c8d97 If you undo that patch, does fate work again? Ronald _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
