diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2010-02-16 19:26:49 +0000 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2010-02-16 19:26:49 +0000 |
commit | a636b58ce17adad640ae392ffcf3f9dade2bff80 (patch) | |
tree | be1dfb9a3ebede197ffae7d106a4e71921c3889d | |
parent | 4abd85141cc70c9c03df069863674b2bf32f1d49 (diff) | |
download | ffmpeg-a636b58ce17adad640ae392ffcf3f9dade2bff80.tar.gz |
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
-rw-r--r-- | libavformat/rtp_asf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtp_asf.c b/libavformat/rtp_asf.c index d44ff5a67f..75662c95f0 100644 --- a/libavformat/rtp_asf.c +++ b/libavformat/rtp_asf.c @@ -196,7 +196,7 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf, av_free(p); } 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; if (!asf->pktbuf) return AVERROR(EIO); |