On Sun, Mar 10, 2013 at 07:03:36PM +0100, Kostya Shishkov wrote: > On Sun, Mar 10, 2013 at 12:32:09AM +0100, Diego Biurrun wrote: > > --- a/libavcodec/h264.c > > +++ b/libavcodec/h264.c > > @@ -3358,8 +3358,8 @@ static int decode_slice_header(H264Context *h, > > H264Context *h0) > > } else if (last_pic_droppable != h->droppable) { > > - av_log_ask_for_sample(h->avctx, > > - "Cannot combine reference > > and non-reference fields in the same frame\n"); > > + avpriv_request_sample(h->avctx, > > + "Combining reference and > > non-reference fields in the same frame"); > > h->picture_structure = last_pic_structure; > > I think I've seen that in one of the previous patches...
This is already rebased on top of the modified version you approved, so it should be good now. > > --- a/libavcodec/truemotion1.c > > +++ b/libavcodec/truemotion1.c > > @@ -355,7 +355,7 @@ static int truemotion1_decode_header(TrueMotion1Context > > *s) > > > > if (s->flags & FLAG_SPRITE) { > > - av_log_ask_for_sample(s->avctx, "SPRITE frame found.\n"); > > + avpriv_request_sample(s->avctx, "SPRITE frame"); > > "Frame with sprite" > > > @@ -365,7 +365,7 @@ static int truemotion1_decode_header(TrueMotion1Context > > *s) > > if ((s->w < 213) && (s->h >= 176)) > > { > > s->flags |= FLAG_INTERPOLATED; > > - av_log_ask_for_sample(s->avctx, "INTERPOLATION > > selected.\n"); > > + avpriv_request_sample(s->avctx, "INTERPOLATION flag"); > > simply "Interpolated frame" Changed locally. > > --- a/libavcodec/wmalosslessdec.c > > +++ b/libavcodec/wmalosslessdec.c > > @@ -925,8 +926,8 @@ static int decode_subframe(WmallDecodeCtx *s) > > if (s->do_lpc) { > > decode_lpc(s); > > - av_log_ask_for_sample(s->avctx, "Inverse LPC filter not " > > - "implemented. Expect wrong > > output.\n"); > > + avpriv_request_sample(s->avctx, "Wrong output may happen. " > > + "Inverse LPC filter"); > > Again - cause should be first Changed locally to Expect wrong output since inverse LPC filter [is not implemented. ...] Diego _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel