comparison h263.c @ 2805:55a6659fc2ee libavcodec

fix user data parsing code so it suppors pre1 and cvs
author michael
date Sun, 24 Jul 2005 09:28:24 +0000
parents dc616c8ef3e6
children 18b231c1cb3d
comparison
equal deleted inserted replaced
2804:dc616c8ef3e6 2805:55a6659fc2ee
5757 s->divx_build= build; 5757 s->divx_build= build;
5758 s->divx_packed= e==3 && last=='p'; 5758 s->divx_packed= e==3 && last=='p';
5759 } 5759 }
5760 5760
5761 /* ffmpeg detection */ 5761 /* ffmpeg detection */
5762 e=sscanf(buf, "FFmpeg%d.%d.%db%d", &ver, &ver2, &ver3, &build); 5762 e=sscanf(buf, "FFmpe%*[^b]b%d", &build)+3;
5763 if(e!=4) 5763 if(e!=4)
5764 e=sscanf(buf, "FFmpeg v%d.%d.%d / libavcodec build: %d", &ver, &ver2, &ver3, &build); 5764 e=sscanf(buf, "FFmpeg v%d.%d.%d / libavcodec build: %d", &ver, &ver2, &ver3, &build);
5765 if(e!=4){ 5765 if(e!=4){
5766 if(strcmp(buf, "ffmpeg")==0){ 5766 if(strcmp(buf, "ffmpeg")==0){
5767 s->ffmpeg_version= 0x000406;
5768 s->lavc_build= 4600; 5767 s->lavc_build= 4600;
5769 } 5768 }
5770 } 5769 }
5771 if(e==4){ 5770 if(e==4){
5772 s->ffmpeg_version= ver*256*256 + ver2*256 + ver3;
5773 s->lavc_build= build; 5771 s->lavc_build= build;
5774 } 5772 }
5775 5773
5776 /* xvid detection */ 5774 /* xvid detection */
5777 e=sscanf(buf, "XviD%d", &build); 5775 e=sscanf(buf, "XviD%d", &build);