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

Merge "AnimEncoder API: In Assemble(), always set animation parameters."

Browse Source
This commit is contained in:
pascal massimino 2015-01-07 13:36:53 -08:00 committed by Gerrit Code Review
commit f00b639b96
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mux/anim_encode.c
View File

@ -1068,7 +1068,7 @@ int WebPAnimEncoderAdd(WebPAnimEncoder* enc, WebPPicture* frame, int duration,
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Bitstream assembly. // Bitstream assembly.
static WebPMuxError ConvertSingleFrameToFullFrame(WebPMux* const mux) { static WebPMuxError OptimizeSingleFrame(WebPMux* const mux) {
// TODO(urvang): If only one frame, re-encode it as a full frame. // TODO(urvang): If only one frame, re-encode it as a full frame.
(void)mux; (void)mux;
return WEBP_MUX_OK; return WEBP_MUX_OK;
@ -1099,11 +1099,11 @@ int WebPAnimEncoderAssemble(WebPAnimEncoder* enc, WebPData* webp_data) {
err = WebPMuxSetCanvasSize(mux, enc->canvas_width_, enc->canvas_height_); err = WebPMuxSetCanvasSize(mux, enc->canvas_width_, enc->canvas_height_);
if (err != WEBP_MUX_OK) goto Err; if (err != WEBP_MUX_OK) goto Err;
err = WebPMuxSetAnimationParams(mux, &enc->options_.anim_params);
if (err != WEBP_MUX_OK) goto Err;
if (enc->frame_count_ == 1) { if (enc->frame_count_ == 1) {
err = ConvertSingleFrameToFullFrame(mux); err = OptimizeSingleFrame(mux);
if (err != WEBP_MUX_OK) goto Err;
} else {
err = WebPMuxSetAnimationParams(mux, &enc->options_.anim_params);
if (err != WEBP_MUX_OK) goto Err; if (err != WEBP_MUX_OK) goto Err;
} }