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_vp8.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_vp8.c')
| -rw-r--r-- | libavformat/rtpdec_vp8.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rtpdec_vp8.c b/libavformat/rtpdec_vp8.c index 3b1ee137aa..e657ca2ad5 100644 --- a/libavformat/rtpdec_vp8.c +++ b/libavformat/rtpdec_vp8.c @@ -41,7 +41,7 @@ static void prepare_packet(AVPacket *pkt, PayloadContext *vp8, int stream) av_init_packet(pkt); pkt->stream_index = stream; pkt->flags = vp8->is_keyframe ? AV_PKT_FLAG_KEY : 0; - pkt->size = url_close_dyn_buf(vp8->data, &pkt->data); + pkt->size = avio_close_dyn_buf(vp8->data, &pkt->data); pkt->destruct = av_destruct_packet; vp8->data = NULL; } @@ -85,7 +85,7 @@ static int vp8_handle_packet(AVFormatContext *ctx, // that for the next av_get_packet call ret = end_packet ? 1 : 0; } - if ((res = url_open_dyn_buf(&vp8->data)) < 0) + if ((res = avio_open_dyn_buf(&vp8->data)) < 0) return res; vp8->is_keyframe = *buf & 1; vp8->timestamp = ts; @@ -138,7 +138,7 @@ static void vp8_free_context(PayloadContext *vp8) { if (vp8->data) { uint8_t *tmp; - url_close_dyn_buf(vp8->data, &tmp); + avio_close_dyn_buf(vp8->data, &tmp); av_free(tmp); } av_free(vp8); |