Skip to content

F
ffmpeg.wasm-core
Commit 2e07f429 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files
Options

Support flicvideo with 904 bytes extradata. 

Fixes ticket #1234.
parent 2ea5f866
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
libavcodec/flicvideo.c
View file @ 2e07f429
...@@ -86,8 +86,9 @@ static av_cold int flic_decode_init(AVCodecContext *avctx) ...@@ -86,8 +86,9 @@ static av_cold int flic_decode_init(AVCodecContext *avctx)
if (avctx->extradata_size != 0 && if (avctx->extradata_size != 0 &&
avctx->extradata_size != 12 && avctx->extradata_size != 12 &&
avctx->extradata_size != 128 && avctx->extradata_size != 128 &&
avctx->extradata_size != 904 &&
avctx->extradata_size != 1024) { avctx->extradata_size != 1024) {
av_log(avctx, AV_LOG_ERROR, "Expected extradata of 12, 128 or 1024 bytes, got %d\n", avctx->extradata_size); av_log(avctx, AV_LOG_ERROR, "Unexpected extradata size %d\n", avctx->extradata_size);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
...@@ -106,8 +107,10 @@ static av_cold int flic_decode_init(AVCodecContext *avctx) ...@@ -106,8 +107,10 @@ static av_cold int flic_decode_init(AVCodecContext *avctx)
ptr += 4; ptr += 4;
} }
depth = 8; depth = 8;
} else if (avctx->extradata_size == 0) {
/* FLI in MOV, see e.g. FFmpeg trac issue #626 */ /* FLI in MOV, see e.g. FFmpeg trac issue #626 */
} else if (avctx->extradata_size == 0 ||
/* see FFmpeg ticket #1234 */
avctx->extradata_size == 904) {
s->fli_type = FLI_TYPE_CODE; s->fli_type = FLI_TYPE_CODE;
depth = 8; depth = 8;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment