On Sat, Nov 22, 2014 at 12:55 PM, Vittorio Giovara <[email protected]> wrote: > On Fri, Nov 21, 2014 at 4:14 PM, Vittorio Giovara > <[email protected]> wrote: >> g >> >> On Fri, Nov 21, 2014 at 3:55 PM, Martin Storsjö <[email protected]> wrote: >>> On Fri, 21 Nov 2014, Vittorio Giovara wrote: >>> >>>> On Fri, Nov 21, 2014 at 1:26 PM, Luca Barbato <[email protected]> wrote: >>>>> >>>>> On 21/11/14 13:57, Vittorio Giovara wrote: >>>>>> >>>>>> CC: [email protected] >>>>>> Bug-Id: CID 29261 >>>>>> --- >>>>>> libavformat/mpegenc.c | 2 +- >>>>>> tests/ref/lavf/mpg | 6 +++--- >>>>>> tests/ref/lavf/ts | 4 ++-- >>>>>> tests/ref/seek/lavf-mpg | 12 ++++++------ >>>>>> tests/ref/seek/lavf-ts | 16 ++++++++-------- >>>>>> 5 files changed, 20 insertions(+), 20 deletions(-) >>>>>> >>>>>> diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c >>>>>> index fed03ed..9640893 100644 >>>>>> --- a/libavformat/mpegenc.c >>>>>> +++ b/libavformat/mpegenc.c >>>>>> @@ -1057,7 +1057,7 @@ retry: >>>>>> es_size -= stream->premux_packet->unwritten_size; >>>>>> stream->premux_packet = stream->premux_packet->next; >>>>>> } >>>>>> - if (es_size) >>>>>> + if (stream->premux_packet && es_size) >>>>>> stream->premux_packet->unwritten_size -= es_size; >>>>>> >>>>> >>>>> Looks fine to me, oracle is still unhappy? >>>> >>>> >>>> unfortunately yes :/ >>> >>> >>> Of course it's unhappy if you update the fate refs - please retry now that >>> the libtwolame registering order has been fixed, you'll find out you don't >>> need to update the fate refs at all, and I'm quite sure it will work fine on >>> oracle as well. >> >> That does seem the case, thanks for the suggestion. >> Rerunning on oracle. > > yep, all green! > Patch ok then? > > -- > Vittorio
Ok'd by Luca. -- Vittorio _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
