[FFmpeg-devel] [PATCH] avformat/avienc: Remove unneeded seekable tests

Michael Niedermayer michael at niedermayer.cc
Sun Mar 6 12:09:03 CET 2016


On Sun, Mar 06, 2016 at 11:53:27AM +0100, Reimar Döffinger wrote:
> On Sat, Mar 05, 2016 at 06:38:40PM +0100, Michael Niedermayer wrote:
> > diff --git a/libavformat/avienc.c b/libavformat/avienc.c
> > index 0cfffb7..357dd34 100644
> > --- a/libavformat/avienc.c
> > +++ b/libavformat/avienc.c
> > @@ -306,8 +306,7 @@ static int avi_write_header(AVFormatContext *s)
> >              avio_wl32(pb, enc->codec_tag);
> >          else
> >              avio_wl32(pb, 1);
> > -        if (enc->codec_type == AVMEDIA_TYPE_VIDEO && pb->seekable)
> > -            avist->strh_flags_offset = avio_tell(pb);
> > +        avist->strh_flags_offset = avio_tell(pb);
> >          avio_wl32(pb, 0); /* flags */
> >          avio_wl16(pb, 0); /* priority */
> >          avio_wl16(pb, 0); /* language */
> > @@ -369,8 +368,7 @@ static int avi_write_header(AVFormatContext *s)
> >                      && enc->pix_fmt == AV_PIX_FMT_RGB555LE
> >                      && enc->bits_per_coded_sample == 15)
> >                      enc->bits_per_coded_sample = 16;
> > -                if (pb->seekable)
> > -                    avist->pal_offset = avio_tell(pb) + 40;
> > +                avist->pal_offset = avio_tell(pb) + 40;
> >                  ff_put_bmp_header(pb, enc, ff_codec_bmp_tags, 0, 0);
> >                  pix_fmt = avpriv_find_pix_fmt(avpriv_pix_fmt_bps_avi,
> >                                                enc->bits_per_coded_sample);
> 
> Looks fine to me.

applied

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Why not whip the teacher when the pupil misbehaves? -- Diogenes of Sinope
-------------- 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/20160306/9a711d0d/attachment.sig>


More information about the ffmpeg-devel mailing list