1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Fix two problems (no idea how this ever worked):

- the return value of url_open_dyn_*buf() is 0 on success, so using
   if (!(res = url_open_dyn_*buf())) return res; is not going to work
- url_open_dyn_packet_buf actually writes the max_packet_size before
   each piece of data. Feeding this to the ASF demuxer will never work.
   Therefore, use url_open_dyn_buf() instead.

Originally committed as revision 21853 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje 2010-02-16 19:26:49 +00:00
parent 4abd85141c
commit a636b58ce1

View File

@ -196,7 +196,7 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf,
av_free(p); av_free(p);
} }
if (!len_off && !asf->pktbuf && if (!len_off && !asf->pktbuf &&
!(res = url_open_dyn_packet_buf(&asf->pktbuf, rt->asf_ctx->packet_size))) (res = url_open_dyn_buf(&asf->pktbuf)) < 0)
return res; return res;
if (!asf->pktbuf) if (!asf->pktbuf)
return AVERROR(EIO); return AVERROR(EIO);