diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-04 02:15:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-04 02:15:12 +0200 |
| commit | 2cae9809e2d59c7336fc2cccb97b82c7f764868a (patch) | |
| tree | 823d962b7237e515e14e2679084e5981d5b808a5 /libavformat/rtpdec_asf.c | |
| parent | 3c9bfb336867ccd32a6e8490930961bcc14b3fdc (diff) | |
| parent | 906fd03070c7dc39b4c937befa2c3559bccf7ba7 (diff) | |
| download | ffmpeg-2cae9809e2d59c7336fc2cccb97b82c7f764868a.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
fate: fix partial run when no samples path is specified
ARM: NEON fixed-point forward MDCT
ARM: NEON fixed-point FFT
lavf: bump minor version and add an APIChanges entry for avio changes
avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()
avio: make url_fdopen internal.
avio: make url_open_dyn_packet_buf internal.
avio: avio_ prefix for url_close_dyn_buf
avio: avio_ prefix for url_open_dyn_buf
avio: introduce an AVIOContext.seekable field
ac3enc: use generic fixed-point mdct
lavfi: add fade filter
Change yadif to not use out of picture lines.
lavc: deprecate AVCodecContext.antialias_algo
lavc: mark mb_qmin/mb_qmax for removal on next major bump.
Conflicts:
doc/filters.texi
libavcodec/ac3enc_fixed.h
libavcodec/ac3enc_float.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_fade.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_asf.c')
| -rw-r--r-- | libavformat/rtpdec_asf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c index 3c19ad6e5b..61bf87d37d 100644 --- a/libavformat/rtpdec_asf.c +++ b/libavformat/rtpdec_asf.c @@ -203,12 +203,12 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf, */ if (asf->pktbuf && len_off != avio_tell(asf->pktbuf)) { uint8_t *p; - url_close_dyn_buf(asf->pktbuf, &p); + avio_close_dyn_buf(asf->pktbuf, &p); asf->pktbuf = NULL; av_free(p); } if (!len_off && !asf->pktbuf && - (res = url_open_dyn_buf(&asf->pktbuf)) < 0) + (res = avio_open_dyn_buf(&asf->pktbuf)) < 0) return res; if (!asf->pktbuf) return AVERROR(EIO); @@ -217,7 +217,7 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf, avio_skip(pb, len - off); if (!(flags & RTP_FLAG_MARKER)) return -1; - out_len = url_close_dyn_buf(asf->pktbuf, &asf->buf); + out_len = avio_close_dyn_buf(asf->pktbuf, &asf->buf); asf->pktbuf = NULL; } else { /** @@ -272,7 +272,7 @@ static void asfrtp_free_context(PayloadContext *asf) { if (asf->pktbuf) { uint8_t *p = NULL; - url_close_dyn_buf(asf->pktbuf, &p); + avio_close_dyn_buf(asf->pktbuf, &p); asf->pktbuf = NULL; av_free(p); } |