Mercurial > libavformat.hg
comparison avidec.c @ 5058:33a244b7ca65 libavformat
Add ff_ prefixes to exported symbols in libavformat/riff.h.
patch by Daniel Verkamp, aniel drv nu
| author | diego |
|---|---|
| date | Mon, 22 Jun 2009 23:09:34 +0000 |
| parents | 911053932726 |
| children | 5de39afaca2e |
comparison
equal
deleted
inserted
replaced
| 5057:c9bbf0a253a8 | 5058:33a244b7ca65 |
|---|---|
| 502 #ifdef DEBUG | 502 #ifdef DEBUG |
| 503 print_tag("video", tag1, 0); | 503 print_tag("video", tag1, 0); |
| 504 #endif | 504 #endif |
| 505 st->codec->codec_type = CODEC_TYPE_VIDEO; | 505 st->codec->codec_type = CODEC_TYPE_VIDEO; |
| 506 st->codec->codec_tag = tag1; | 506 st->codec->codec_tag = tag1; |
| 507 st->codec->codec_id = codec_get_id(codec_bmp_tags, tag1); | 507 st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1); |
| 508 st->need_parsing = AVSTREAM_PARSE_HEADERS; // This is needed to get the pict type which is necessary for generating correct pts. | 508 st->need_parsing = AVSTREAM_PARSE_HEADERS; // This is needed to get the pict type which is necessary for generating correct pts. |
| 509 | 509 |
| 510 if(st->codec->codec_tag==0 && st->codec->height > 0 && st->codec->extradata_size < 1U<<30){ | 510 if(st->codec->codec_tag==0 && st->codec->height > 0 && st->codec->extradata_size < 1U<<30){ |
| 511 st->codec->extradata_size+= 9; | 511 st->codec->extradata_size+= 9; |
| 512 st->codec->extradata= av_realloc(st->codec->extradata, st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); | 512 st->codec->extradata= av_realloc(st->codec->extradata, st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
| 516 st->codec->height= FFABS(st->codec->height); | 516 st->codec->height= FFABS(st->codec->height); |
| 517 | 517 |
| 518 // url_fskip(pb, size - 5 * 4); | 518 // url_fskip(pb, size - 5 * 4); |
| 519 break; | 519 break; |
| 520 case CODEC_TYPE_AUDIO: | 520 case CODEC_TYPE_AUDIO: |
| 521 get_wav_header(pb, st->codec, size); | 521 ff_get_wav_header(pb, st->codec, size); |
| 522 if(ast->sample_size && st->codec->block_align && ast->sample_size != st->codec->block_align){ | 522 if(ast->sample_size && st->codec->block_align && ast->sample_size != st->codec->block_align){ |
| 523 av_log(s, AV_LOG_WARNING, "sample size (%d) != block align (%d)\n", ast->sample_size, st->codec->block_align); | 523 av_log(s, AV_LOG_WARNING, "sample size (%d) != block align (%d)\n", ast->sample_size, st->codec->block_align); |
| 524 ast->sample_size= st->codec->block_align; | 524 ast->sample_size= st->codec->block_align; |
| 525 } | 525 } |
| 526 if (size%2) /* 2-aligned (fix for Stargate SG-1 - 3x18 - Shades of Grey.avi) */ | 526 if (size%2) /* 2-aligned (fix for Stargate SG-1 - 3x18 - Shades of Grey.avi) */ |