History

Merge remote-tracking branch 'qatar/master'

* qatar/master: avconv: add an assert to silence an uninitialized variable warning. avconv: shut up an uninitialized variable warning. avfiltergraph: shut up uninitialized variable warning. af_join: initialize a variable to shut up gcc warning. amix: fix format specifier for AVFilterLink.sample_rate. lavfi: make filters less verbose. mpc8: read APE tags. lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes libm: provide fallback definition for cbrtf() using powf() network: Don't redefine error codes if they already exist in errno.h configure: Check for sys/time.h network: Include unistd.h from network.h avconv: don't include vsrc_buffer.h, which doesn't exist anymore lavfi: reorder AVFilterLink fields. lavfi: reorder AVFilterContext fields. lavfi: reorder AVFilter fields. lavfi: reorder AVFilterBufferRef fields. lavfi: reorder AVFilterBuffer fields. Conflicts: configure libavcodec/v210dec.h libavfilter/asrc_anullsrc.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_crop.c libavfilter/vf_drawbox.c libavfilter/vf_fade.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vsrc_color.c libavformat/network.h libavutil/libm.h

Michael Niedermayer committed 14 years ago

Commit b536e2f2 parents 5916bc4 c29c1a139 files · +169 −135Browse files

Showing the changes to libavfilter/avfilter.c (1 of 39 files). Show all

Unified · Split

libavfilter/avfilter.c+1−1
@@ -163,7 +163,7 @@ int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt, · 162 unmodified lines
163 int ret;163 int ret;
164 unsigned dstpad_idx = link->dstpad - link->dst->input_pads;164 unsigned dstpad_idx = link->dstpad - link->dst->input_pads;
165 165
166 av_log(link->dst, AV_LOG_INFO, "auto-inserting filter '%s' "166 av_log(link->dst, AV_LOG_VERBOSE, "auto-inserting filter '%s' "
167 "between the filter '%s' and the filter '%s'\n",167 "between the filter '%s' and the filter '%s'\n",
168 filt->name, link->src->name, link->dst->name);168 filt->name, link->src->name, link->dst->name);
169 169

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t