diff options
| author | Piotr Bandurski <ami_stuff@o2.pl> | 2012-05-19 02:09:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-20 16:29:08 +0200 |
| commit | cb7b0f3573f392d1c340ea7d0b78f58d8dd07b4a (patch) | |
| tree | 751ec51cf4e509df7a5970df154b6212fbdaf4ba /libavcodec/flicvideo.c | |
| parent | 718b90d4b939b09ea2c9996905edf3e482454023 (diff) | |
| download | ffmpeg-streaming-cb7b0f3573f392d1c340ea7d0b78f58d8dd07b4a.zip ffmpeg-streaming-cb7b0f3573f392d1c340ea7d0b78f58d8dd07b4a.tar.gz | |
flicvideo: support 256-bytes extradata
sample:
http://www.datafilehost.com/download-ab1156a9.html
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flicvideo.c')
| -rw-r--r-- | libavcodec/flicvideo.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 1bf1a76..43774d5 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -86,6 +86,7 @@ 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 != 256 && avctx->extradata_size != 904 && avctx->extradata_size != 1024) { 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; /* FLI in MOV, see e.g. FFmpeg trac issue #626 */ } else if (avctx->extradata_size == 0 || + avctx->extradata_size == 256 || /* see FFmpeg ticket #1234 */ avctx->extradata_size == 904) { s->fli_type = FLI_TYPE_CODE; |
