dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-11-20 04:18:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "mux.h does NOT need to include encode.h"

Browse Source
This commit is contained in:
Pascal Massimino 2015-11-10 07:04:34 +00:00 committed by Gerrit Code Review
commit afd5a62cd4
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mux/anim_encode.c
View File

@ -16,6 +16,7 @@
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/decode.h" #include "../webp/decode.h"
#include "../webp/encode.h"
#include "../webp/format_constants.h" #include "../webp/format_constants.h"
#include "../webp/mux.h" #include "../webp/mux.h"

14
src/webp/mux.h
View File

@ -15,7 +15,6 @@
#ifndef WEBP_WEBP_MUX_H_ #ifndef WEBP_WEBP_MUX_H_
#define WEBP_WEBP_MUX_H_ #define WEBP_WEBP_MUX_H_
#include "./encode.h"
#include "./mux_types.h" #include "./mux_types.h"
#ifdef __cplusplus #ifdef __cplusplus
@ -68,6 +67,7 @@ extern "C" {
typedef struct WebPMux WebPMux; // main opaque object. typedef struct WebPMux WebPMux; // main opaque object.
typedef struct WebPMuxFrameInfo WebPMuxFrameInfo; typedef struct WebPMuxFrameInfo WebPMuxFrameInfo;
typedef struct WebPMuxAnimParams WebPMuxAnimParams; typedef struct WebPMuxAnimParams WebPMuxAnimParams;
typedef struct WebPAnimEncoderOptions WebPAnimEncoderOptions;
// Error codes // Error codes
typedef enum WebPMuxError { typedef enum WebPMuxError {
@ -417,8 +417,12 @@ WEBP_EXTERN(WebPMuxError) WebPMuxAssemble(WebPMux* mux,
typedef struct WebPAnimEncoder WebPAnimEncoder; // Main opaque object. typedef struct WebPAnimEncoder WebPAnimEncoder; // Main opaque object.
// Forward declarations. Defined in encode.h.
struct WebPPicture;
struct WebPConfig;
// Global options. // Global options.
typedef struct { struct WebPAnimEncoderOptions {
WebPMuxAnimParams anim_params; // Animation parameters. WebPMuxAnimParams anim_params; // Animation parameters.
int minimize_size; // If true, minimize the output size (slow). Implicitly int minimize_size; // If true, minimize the output size (slow). Implicitly
// disables key-frame insertion. // disables key-frame insertion.
@ -437,7 +441,7 @@ typedef struct {
// string attached to the encoder. // string attached to the encoder.
int verbose; // If true, print encoding info. int verbose; // If true, print encoding info.
uint32_t padding[4]; // Padding for later use. uint32_t padding[4]; // Padding for later use.
} WebPAnimEncoderOptions; };
// Internal, version-checked, entry point. // Internal, version-checked, entry point.
WEBP_EXTERN(int) WebPAnimEncoderOptionsInitInternal( WEBP_EXTERN(int) WebPAnimEncoderOptionsInitInternal(
@ -489,8 +493,8 @@ static WEBP_INLINE WebPAnimEncoder* WebPAnimEncoderNew(
// On error, returns false and frame->error_code is set appropriately. // On error, returns false and frame->error_code is set appropriately.
// Otherwise, returns true. // Otherwise, returns true.
WEBP_EXTERN(int) WebPAnimEncoderAdd( WEBP_EXTERN(int) WebPAnimEncoderAdd(
WebPAnimEncoder* enc, WebPPicture* frame, int timestamp_ms, WebPAnimEncoder* enc, struct WebPPicture* frame, int timestamp_ms,
const WebPConfig* config); const struct WebPConfig* config);
// Assemble all frames added so far into a WebP bitstream. // Assemble all frames added so far into a WebP bitstream.
// This call should be preceded by a call to 'WebPAnimEncoderAdd' with // This call should be preceded by a call to 'WebPAnimEncoderAdd' with