diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-04-22 22:07:02 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-04-22 22:07:02 +0200 |
| commit | 2e07f42957666df6d7c63a62263b8447e97b1442 (patch) | |
| tree | 9f31a29b1de0527b21d9a5769bbff67b71817527 /libavcodec/flicvideo.c | |
| parent | 2ea5f866e626448fc272893e57632d6428437f1e (diff) | |
| download | ffmpeg-streaming-2e07f42957666df6d7c63a62263b8447e97b1442.zip ffmpeg-streaming-2e07f42957666df6d7c63a62263b8447e97b1442.tar.gz | |
Support flicvideo with 904 bytes extradata.
Fixes ticket #1234.
Diffstat (limited to 'libavcodec/flicvideo.c')
| -rw-r--r-- | libavcodec/flicvideo.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 1754eef..1bf1a76 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -86,8 +86,9 @@ static av_cold int flic_decode_init(AVCodecContext *avctx) if (avctx->extradata_size != 0 && avctx->extradata_size != 12 && avctx->extradata_size != 128 && + avctx->extradata_size != 904 && 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; } @@ -106,8 +107,10 @@ static av_cold int flic_decode_init(AVCodecContext *avctx) ptr += 4; } depth = 8; - } else if (avctx->extradata_size == 0) { /* 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; depth = 8; } else { |
