X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg.h;h=6544e6fb05ad9c99631a0342e7ae0561856cfe19;hb=7213d3fbf30b6be53c272c1c61c797a2b7b697a0;hp=7467b165f80a400977d0a438063614e01bd657f8;hpb=9ca19971bcdd1af39680c15a0319d57505b9542b;p=ffmpeg diff --git a/ffmpeg.h b/ffmpeg.h index 7467b165f80..6544e6fb05a 100644 --- a/ffmpeg.h +++ b/ffmpeg.h @@ -63,6 +63,7 @@ enum HWAccelID { HWACCEL_VDPAU, HWACCEL_DXVA2, HWACCEL_VDA, + HWACCEL_VIDEOTOOLBOX, }; typedef struct HWAccel { @@ -431,8 +432,8 @@ typedef struct OutputStream { char *filters; ///< filtergraph associated to the -filter option char *filters_script; ///< filtergraph script associated to the -filter_script option - int64_t sws_flags; AVDictionary *encoder_opts; + AVDictionary *sws_dict; AVDictionary *swr_opts; AVDictionary *resample_opts; AVDictionary *bsf_args; @@ -520,6 +521,7 @@ extern int frame_bits_per_raw_sample; extern AVIOContext *progress_avio; extern float max_error_rate; extern int vdpau_api_ver; +extern char *videotoolbox_pixfmt; extern const AVIOInterruptCB int_cb; @@ -554,5 +556,6 @@ int ffmpeg_parse_options(int argc, char **argv); int vdpau_init(AVCodecContext *s); int dxva2_init(AVCodecContext *s); int vda_init(AVCodecContext *s); +int videotoolbox_init(AVCodecContext *s); #endif /* FFMPEG_H */