Skip to content
Snippets Groups Projects
Commit cb7b0f35 authored by Piotr Bandurski's avatar Piotr Bandurski Committed by Michael Niedermayer
Browse files

flicvideo: support 256-bytes extradata

parent 718b90d4
No related branches found
No related tags found
No related merge requests found
...@@ -86,6 +86,7 @@ static av_cold int flic_decode_init(AVCodecContext *avctx) ...@@ -86,6 +86,7 @@ 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 != 256 &&
avctx->extradata_size != 904 && avctx->extradata_size != 904 &&
avctx->extradata_size != 1024) { avctx->extradata_size != 1024) {
av_log(avctx, AV_LOG_ERROR, "Unexpected extradata size %d\n", avctx->extradata_size); av_log(avctx, AV_LOG_ERROR, "Unexpected extradata size %d\n", avctx->extradata_size);
...@@ -109,6 +110,7 @@ static av_cold int flic_decode_init(AVCodecContext *avctx) ...@@ -109,6 +110,7 @@ static av_cold int flic_decode_init(AVCodecContext *avctx)
depth = 8; depth = 8;
/* 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 || } else if (avctx->extradata_size == 0 ||
avctx->extradata_size == 256 ||
/* see FFmpeg ticket #1234 */ /* see FFmpeg ticket #1234 */
avctx->extradata_size == 904) { avctx->extradata_size == 904) {
s->fli_type = FLI_TYPE_CODE; s->fli_type = FLI_TYPE_CODE;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment