On Sat, Dec 03, 2016 at 02:03:22PM +0100, Andreas Cadhalpun wrote: > On 03.12.2016 13:14, Michael Niedermayer wrote: > > On Sat, Dec 03, 2016 at 12:51:12PM +0100, Andreas Cadhalpun wrote: > >> On 03.12.2016 00:52, Michael Niedermayer wrote: > >>> @@ -364,14 +364,19 @@ static int ffm2_read_header(AVFormatContext *s) > >>> } > >>> codecpar->bit_rate = avio_rb32(pb); > >>> if (codecpar->bit_rate < 0) { > >>> - av_log(codec, AV_LOG_ERROR, "Invalid bit rate > >>> %"PRId64"\n", codecpar->bit_rate); > >>> + av_log(s, AV_LOG_ERROR, "Invalid bit rate %"PRId64"\n", > >>> codecpar->bit_rate); > >>> ret = AVERROR_INVALIDDATA; > >>> goto fail; > >>> } > >>> - codec->flags = avio_rb32(pb); > >>> + flags = avio_rb32(pb); > >>> +#if FF_API_LAVF_AVCTX > >>> +FF_DISABLE_DEPRECATION_WARNINGS > >>> + st->codec->flags = flags; > >>> +FF_ENABLE_DEPRECATION_WARNINGS > >>> +#endif > >> > >> What's the point of this? It doesn't seem to be needed by ffserver. > > > > not by the current one but by the one a few commits ago > > I see, commit 311107. Patch is OK.
applied thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Those who are best at talking, realize last or never when they are wrong.
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel