diff options
| -rw-r--r-- | fftools/ffmpeg.h | 7 | ||||
| -rw-r--r-- | fftools/ffmpeg_filter.c | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index fa726575f4..5aeceae6b7 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -640,21 +640,14 @@ extern HWDevice *filter_hw_device; void term_init(void); void term_exit(void); -void reset_options(OptionsContext *o, int is_input); void show_usage(void); -void opt_output_file(void *optctx, const char *filename); - void remove_avoptions(AVDictionary **a, AVDictionary *b); void assert_avoptions(AVDictionary *m); int guess_input_channel_layout(InputStream *ist); -enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *avctx, - const AVCodec *codec, enum AVPixelFormat target); - int configure_filtergraph(FilterGraph *fg); -int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out); void check_filter_outputs(void); int filtergraph_is_simple(FilterGraph *fg); int init_simple_filtergraph(InputStream *ist, OutputStream *ost); diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 00534d7e92..9218394f4a 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -60,7 +60,7 @@ static const enum AVPixelFormat *get_compliance_unofficial_pix_fmts(enum AVCodec } } -enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx, +static enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx, const AVCodec *codec, enum AVPixelFormat target) { if (codec && codec->pix_fmts) { @@ -645,7 +645,8 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, return 0; } -int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) +static int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, + AVFilterInOut *out) { if (!ofilter->ost) { av_log(NULL, AV_LOG_FATAL, "Filter %s has an unconnected output\n", ofilter->name); |