virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

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

Browse Source 
Originally committed as revision 4013 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2005-03-06 19:40:12 +00:00 committed by Michael Niedermayer
parent fc90504b99
commit 26165f99c6
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/h264.c
View File

@ -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;