Imported Upstream version 0.14.2+dfsg1

This commit is contained in:
Sebastian Ramacher 2016-05-24 21:53:01 +02:00
parent fb3990e9e5
commit 41a01dbf05
529 changed files with 25112 additions and 2336 deletions

View file

@ -29,6 +29,8 @@
extern "C" {
#endif
#define OBS_ENCODER_CAP_DEPRECATED (1<<0)
/** Specifies the encoder type */
enum obs_encoder_type {
OBS_ENCODER_AUDIO, /**< The encoder provides an audio codec */
@ -227,6 +229,8 @@ struct obs_encoder_info {
void *type_data;
void (*free_type_data)(void *type_data);
uint32_t caps;
};
EXPORT void obs_register_encoder_s(const struct obs_encoder_info *info,