diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-10 22:41:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-10 23:30:42 +0200 |
| commit | 015903294ca983f007ab5cae098a54013e77f2f6 (patch) | |
| tree | 66838f53dca82964270a1938692489c36e1fb1b0 /libavfilter/af_ashowinfo.c | |
| parent | 2a793ff2bf2197f36db3bf296668d44915142d03 (diff) | |
| parent | 110d0cdc9d1ec414a658f841a3fbefbf6f796d61 (diff) | |
| download | ffmpeg-015903294ca983f007ab5cae098a54013e77f2f6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* 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
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_ashowinfo.c')
| -rw-r--r-- | libavfilter/af_ashowinfo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index 12d0315f0e..c336c52c0b 100644 --- a/libavfilter/af_ashowinfo.c +++ b/libavfilter/af_ashowinfo.c @@ -83,7 +83,7 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref) av_log(ctx, AV_LOG_INFO, "]\n"); showinfo->frame++; - avfilter_filter_samples(inlink->dst->outputs[0], samplesref); + ff_filter_samples(inlink->dst->outputs[0], samplesref); } AVFilter avfilter_af_ashowinfo = { @@ -95,7 +95,7 @@ AVFilter avfilter_af_ashowinfo = { .inputs = (const AVFilterPad[]) {{ .name = "default", .type = AVMEDIA_TYPE_AUDIO, - .get_audio_buffer = avfilter_null_get_audio_buffer, + .get_audio_buffer = ff_null_get_audio_buffer, .filter_samples = filter_samples, .min_perms = AV_PERM_READ, }, { .name = NULL}}, |