vaapi_encode: Remove common priv_data and options fields

The codec-specific context now contains both the common context and the codec-specific options directly.

Mark Thompson committed 8 years ago

Commit c5b4ad21 parent 16161068 files · +0 −33Browse files

Showing the changes to libavcodec/vaapi_encode.h (1 of 8 files). Show all

Unified · Split

     // Everything above this point must be set before calling
     // ff_vaapi_encode_init().
-    // Codec-specific state.
-    void *priv_data;
     // Configuration attributes to use when creating va_config.
     VAConfigAttrib  config_attributes[MAX_CONFIG_ATTRIBUTES];
     int          nb_config_attributes;
     int gop_counter;
     int p_counter;
     int end_of_stream;
-    // Codec-local options are allocated to follow this structure in
-    // memory (in the AVCodec definition, set priv_data_size to
-    // sizeof(VAAPIEncodeContext) + sizeof(VAAPIEncodeFooOptions)).
-    void *codec_options;
-    char codec_options_data[0];
 } VAAPIEncodeContext;
 typedef struct VAAPIEncodeType {
-    size_t priv_data_size;
     // Perform any extra codec-specific configuration after the
     // codec context is initialised (set up the private data and
     // add any necessary global parameters).

Keyboard shortcuts