har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flicvideo: support 256-bytes extradata

Browse Source 
sample:

http://www.datafilehost.com/download-ab1156a9.html

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Piotr Bandurski 2012-05-19 02:09:18 +02:00 committed by Michael Niedermayer
parent 718b90d4b9
commit cb7b0f3573
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/flicvideo.c
View File

@ -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)
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;