Mercurial > libavcodec.hg

comparison tiff.c @ 10337:d1014913ad1b libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not attempt to decode TIFF files containing fax data with uncompressed mode allowed for there is no code to decode it (yet).
author kostya
date Thu, 01 Oct 2009 06:31:49 +0000
parents 5bbe55451800
children bdf4a9ca162a
comparison
equal deleted inserted replaced
10336:a554d7e29e99 10337:d1014913ad1b
135 int i, ret = 0; 135 int i, ret = 0;
136 uint8_t *src2 = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); 136 uint8_t *src2 = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
137 137
138 if(!src2 || (unsigned)size + FF_INPUT_BUFFER_PADDING_SIZE < (unsigned)size){ 138 if(!src2 || (unsigned)size + FF_INPUT_BUFFER_PADDING_SIZE < (unsigned)size){
139 av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n"); 139 av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
140 return -1;
141 }
142 if(s->fax_opts & 2){
143 av_log(s->avctx, AV_LOG_ERROR, "Uncompressed fax mode is not supported (yet)\n");
144 av_free(src2);
140 return -1; 145 return -1;
141 } 146 }
142 if(!s->fill_order){ 147 if(!s->fill_order){
143 memcpy(src2, src, size); 148 memcpy(src2, src, size);
144 }else{ 149 }else{