* qatar/master: (25 commits) rv40dsp x86: MMX/MMX2/3DNow/SSE2/SSSE3 implementations of MC ape: Use unsigned integer maths arm: dsputil: fix overreads in put/avg_pixels functions h264: K&R formatting cosmetics for header files (part II/II) h264: K&R formatting cosmetics for header files (part I/II) rtmp: Implement check bandwidth notification. rtmp: Support 'rtmp_swfurl', an option which specifies the URL of the SWF player. rtmp: Support 'rtmp_flashver', an option which overrides the version of the Flash plugin. rtmp: Support 'rtmp_tcurl', an option which overrides the URL of the target stream. cmdutils: Add fallback case to switch in check_stream_specifier(). sctp: be consistent with socket option level configure: Add _XOPEN_SOURCE=600 to Solaris preprocessor flags. vcr1enc: drop pointless empty encode_init() wrapper function vcr1: drop pointless write-only AVCodecContext member from VCR1Context vcr1: group encoder code together to save #ifdefs vcr1: cosmetics: K&R prettyprinting, typos, parentheses, dead code, comments mov: make one comment slightly more specific lavr: replace the SSE version of ff_conv_fltp_to_flt_6ch() with SSE4 and AVX lavfi: move audio-related functions to a separate file. lavfi: remove some audio-related function from public API. ... Conflicts: cmdutils.c libavcodec/h264.h libavcodec/h264_mvpred.h libavcodec/vcr1.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/defaults.c libavfilter/internal.h
Showing the changes to libavfilter/src_buffer.c (1 of 44 files). Show all
Unified · Split
| @@ -297,7 +297,7 @@ static AVFilterBufferRef *copy_buffer_ref(AVFilterContext *ctx, · 296 unmodified lines | ||
| 297 | 297 | break; |
| 298 | 298 | |
| 299 | 299 | case AVMEDIA_TYPE_AUDIO: |
| 300 | − buf = avfilter_get_audio_buffer(outlink, AV_PERM_WRITE, | |
| 300 | + buf = ff_get_audio_buffer(outlink, AV_PERM_WRITE, | |
| 301 | 301 | ref->audio->nb_samples); |
| 302 | 302 | channels = av_get_channel_layout_nb_channels(ref->audio->channel_layout); |
| 303 | 303 | data_size = av_samples_get_buffer_size(NULL, channels, |
| @@ -562,7 +562,7 @@ static int request_frame(AVFilterLink *link) · 258 unmodified lines | ||
| 562 | 562 | avfilter_unref_buffer(buf); |
| 563 | 563 | break; |
| 564 | 564 | case AVMEDIA_TYPE_AUDIO: |
| 565 | − avfilter_filter_samples(link, avfilter_ref_buffer(buf, ~0)); | |
| 565 | + ff_filter_samples(link, avfilter_ref_buffer(buf, ~0)); | |
| 566 | 566 | avfilter_unref_buffer(buf); |
| 567 | 567 | break; |
| 568 | 568 | default: |