On Wed, Jun 29, 2011 at 02:55:26PM -0700, Ronald S. Bultje wrote:
> 
> On Wed, Jun 29, 2011 at 2:54 PM, Diego Biurrun <[email protected]> wrote:
> > On Wed, Jun 29, 2011 at 10:45:50PM +0100, Måns Rullgård wrote:
> >> Diego Biurrun <[email protected]> writes:
> >>
> >> > On Wed, Jun 29, 2011 at 02:13:20PM -0700, Ronald S. Bultje wrote:
> >> >>
> >> >> --- a/libavformat/matroskadec.c
> >> >> +++ b/libavformat/matroskadec.c
> >> >> @@ -1879,11 +1879,13 @@ static int 
> >> >> matroska_parse_cluster(MatroskaDemuxContext *matroska)
> >> >>  static int matroska_read_packet(AVFormatContext *s, AVPacket *pkt)
> >> >>  {
> >> >>      MatroskaDemuxContext *matroska = s->priv_data;
> >> >> +    int ret;
> >> >>
> >> >>      while (matroska_deliver_packet(matroska, pkt)) {
> >> >>          if (matroska->done)
> >> >>              return AVERROR_EOF;
> >> >> -        matroska_parse_cluster(matroska);
> >> >> +        ret = matroska_parse_cluster(matroska);
> >> >> +        if (ret) return ret;
> >> >>      }
> >> >>
> >> >>      return 0;
> >> >
> >> > Why not just 'return ret;'?
> >>
> >> Do you mean something like this:
> >>
> >>     int ret = 0;
> >>     while (!ret && matroska_deliver_packet()) {
> >>         ...
> >>         ret = matroska_parse_cluster();
> >>     }
> >>     return ret;
> >
> > Yes, something like this.
> 
> Changed to that. OK to commit then?

Yes.

Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to