Commit 8f0eb85b authored by michael's avatar michael

improved detection of "AVC1" style H.264 patch by (Måns Rullgård <mru inprovide com>)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4013 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent bd8ad477
......@@ -2632,15 +2632,13 @@ static int decode_init(AVCodecContext *avctx){
decode_init_vlc(h);
if(avctx->codec_tag != 0x31637661 && avctx->codec_tag != 0x31435641) // avc1
h->is_avc = 0;
else {
if((avctx->extradata_size == 0) || (avctx->extradata == NULL)) {
av_log(avctx, AV_LOG_ERROR, "AVC codec requires avcC data\n");
return -1;
}
if(avctx->extradata_size > 0 && avctx->extradata &&
*(char *)avctx->extradata == 1){
av_log(avctx, AV_LOG_INFO, "assuming AVC1 format\n");
h->is_avc = 1;
h->got_avcC = 0;
} else {
h->is_avc = 0;
}
return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment