This avoids a dependancy of libavfilter on libavcodec See Ticket 3592 Fixes Ticket2784
Showing the changes to libavfilter/avfiltergraph.c (1 of 6 files). Show all
Unified · Split
| @@ -31,7 +31,6 @@ · 30 unmodified lines | |||
| 31 | #include "libavutil/internal.h" | 31 | #include "libavutil/internal.h" |
| 32 | #include "libavutil/opt.h" | 32 | #include "libavutil/opt.h" |
| 33 | #include "libavutil/pixdesc.h" | 33 | #include "libavutil/pixdesc.h" |
| 34 | #include "libavcodec/avcodec.h" // avcodec_find_best_pix_fmt_of_2() | ||
| 35 | 34 | ||
| 36 | #include "avfilter.h" | 35 | #include "avfilter.h" |
| 37 | #include "formats.h" | 36 | #include "formats.h" |
| @@ -628,7 +627,7 @@ static int pick_format(AVFilterLink *link, AVFilterLink *ref) · 590 unmodified lines | |||
| 628 | int i; | 627 | int i; |
| 629 | for (i=0; i<link->in_formats->nb_formats; i++) { | 628 | for (i=0; i<link->in_formats->nb_formats; i++) { |
| 630 | enum AVPixelFormat p = link->in_formats->formats[i]; | 629 | enum AVPixelFormat p = link->in_formats->formats[i]; |
| 631 | best= avcodec_find_best_pix_fmt_of_2(best, p, ref->format, has_alpha, NULL); | 630 | best= av_find_best_pix_fmt_of_2(best, p, ref->format, has_alpha, NULL); |
| 632 | } | 631 | } |
| 633 | av_log(link->src,AV_LOG_DEBUG, "picking %s out of %d ref:%s alpha:%d\n", | 632 | av_log(link->src,AV_LOG_DEBUG, "picking %s out of %d ref:%s alpha:%d\n", |
| 634 | av_get_pix_fmt_name(best), link->in_formats->nb_formats, | 633 | av_get_pix_fmt_name(best), link->in_formats->nb_formats, |