x86inc: warn if XOP integer FMA instruction emulation is impossible

[ffmpeg] / ffmpeg.h

diff --git a/ffmpeg.h b/ffmpeg.h
index e43c985f52d4343d79bf4a30bc8b7dc0f320553f..03ba2d0d99027eb33d33a6857b4daadc6ae8f90b 100644 (file)
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -63,6 +63,7 @@ enum HWAccelID {
     HWACCEL_VDPAU,
     HWACCEL_DXVA2,
     HWACCEL_VDA,
+    HWACCEL_VIDEOTOOLBOX,
 };
 
 typedef struct HWAccel {
@@ -92,6 +93,7 @@ typedef struct OptionsContext {
 
     /* input/output options */
     int64_t start_time;
+    int64_t start_time_eof;
     int seek_timestamp;
     const char *format;
 
@@ -459,6 +461,12 @@ typedef struct OutputStream {
 
     /* packet quality factor */
     int quality;
+
+    /* packet picture type */
+    int pict_type;
+
+    /* frame encode sum of squared error values */
+    int64_t error[4];
 } OutputStream;
 
 typedef struct OutputFile {
@@ -513,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;
 
@@ -547,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 */