X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cmdutils.h;h=e001ab9201487f90281655dc273e49b22e4bde66;hb=6cbe81999b07862895515fcbdae7bc3a320ca29c;hp=171ef3cb5b70baf6f4a98ac3708a613b6f0a0025;hpb=96f931adf75967dc86fbf3ee21517e539d0a6e50;p=ffmpeg diff --git a/cmdutils.h b/cmdutils.h index 171ef3cb5b7..e001ab92014 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -47,6 +47,7 @@ extern const char **opt_names; extern AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB]; extern AVFormatContext *avformat_opts; extern struct SwsContext *sws_opts; +extern AVDictionary *format_opts, *video_opts, *audio_opts, *sub_opts; /** * Initialize the cmdutils option system, in particular @@ -128,7 +129,6 @@ typedef struct { #define OPT_INT64 0x0400 #define OPT_EXIT 0x0800 #define OPT_DATA 0x1000 -#define OPT_DUMMY 0x2000 union { int *int_arg; char **str_arg; @@ -260,19 +260,4 @@ int read_file(const char *filename, char **bufptr, size_t *size); FILE *get_preset_file(char *filename, size_t filename_size, const char *preset_name, int is_path, const char *codec_name); -typedef struct { - enum PixelFormat pix_fmt; -} FFSinkContext; - -extern AVFilter ffsink; - -/** - * Extract a frame from sink. - * - * @return a negative error in case of failure, 1 if one frame has - * been extracted successfully. - */ -int get_filtered_video_frame(AVFilterContext *sink, AVFrame *frame, - AVFilterBufferRef **picref, AVRational *pts_tb); - #endif /* FFMPEG_CMDUTILS_H */