* 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
Showing the changes to libavfilter/avfiltergraph.c (1 of 39 files). Show all
Unified · Split
| @@ -33,6 +33,7 @@ · 32 unmodified lines | ||
| 33 | 33 | #include "internal.h" |
| 34 | 34 | |
| 35 | 35 | #include "libavutil/audioconvert.h" |
| 36 | +#include "libavutil/avassert.h" | |
| 36 | 37 | #include "libavutil/log.h" |
| 37 | 38 | |
| 38 | 39 | static const AVClass filtergraph_class = { |
| @@ -648,7 +649,7 @@ static void swap_sample_fmts_on_filter(AVFilterContext *filter) · 609 unmodified lines | ||
| 648 | 649 | |
| 649 | 650 | for (i = 0; i < filter->nb_outputs; i++) { |
| 650 | 651 | AVFilterLink *outlink = filter->outputs[i]; |
| 651 | − int best_idx, best_score = INT_MIN; | |
| 652 | + int best_idx = -1, best_score = INT_MIN; | |
| 652 | 653 | |
| 653 | 654 | if (outlink->type != AVMEDIA_TYPE_AUDIO || |
| 654 | 655 | outlink->in_formats->format_count < 2) |
| @@ -681,6 +682,7 @@ static void swap_sample_fmts_on_filter(AVFilterContext *filter) · 26 unmodified lines | ||
| 681 | 682 | best_idx = j; |
| 682 | 683 | } |
| 683 | 684 | } |
| 685 | + av_assert0(best_idx >= 0); | |
| 684 | 686 | FFSWAP(int, outlink->in_formats->formats[0], |
| 685 | 687 | outlink->in_formats->formats[best_idx]); |
| 686 | 688 | } |