On Thu, 12 Sep 2013, Alexandra Khirnova wrote:
Conflicts: libavformat/utils.c --- libavformat/utils.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)diff --git a/libavformat/utils.c b/libavformat/utils.c index 83c8fe1..3d4366a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -449,7 +449,7 @@ fail: /*******************************************************/ -static void probe_codec(AVFormatContext *s, AVStream *st, const AVPacket *pkt) +static int probe_codec(AVFormatContext *s, AVStream *st, const AVPacket *pkt) { if(st->codec->codec_id == AV_CODEC_ID_PROBE){ AVProbeData *pd = &st->probe_data; @@ -457,7 +457,10 @@ static void probe_codec(AVFormatContext *s, AVStream *st, const AVPacket *pkt) --st->probe_packets; if (pkt) { - pd->buf = av_realloc(pd->buf, pd->buf_size+pkt->size+AVPROBE_PADDING_SIZE); + int err; + if ((err = av_reallocp(&pd->buf, pd->buf_size + pkt->size + + AVPROBE_PADDING_SIZE)) < 0) + return err;
There's no av_reallocp function in libav git master (yet), so this doesn't compile as such. There's a pending patch from Luca from June this year though, but it hasn't been reviewed and merged.
Please include such dependencies in the patchset, or at least mention them in patch annotations.
// Martin _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
