# HG changeset patch # User arpi # Date 997277896 0 # Node ID d377ea93892d9e425aac21b5bcf83b71fb67df87 # Parent a776747517c0d945c014804b710193d7905bca1f mpeg2 fourcc changed diff -r a776747517c0 -r d377ea93892d DOCS/codecs.conf --- a/DOCS/codecs.conf Wed Aug 08 13:34:08 2001 +0000 +++ b/DOCS/codecs.conf Wed Aug 08 13:38:16 2001 +0000 @@ -40,7 +40,8 @@ info "MPEG 1 or 2" comment "with postprocessing" status working - format 0x10000001 + format 0x10000001 ; mpeg 1 + format 0x10000002 ; mpeg 2 driver libmpeg2 dll "libmpeg2" out YV12 @@ -187,8 +188,9 @@ videocodec ffmpeg12 info "FFmpeg-1" - status working - format 0x10000001 + status buggy + format 0x10000001 ; mpeg 1 + format 0x10000002 ; mpeg 2 is broken driver ffmpeg dll "mpegvideo" out YV12 diff -r a776747517c0 -r d377ea93892d dec_video.c --- a/dec_video.c Wed Aug 08 13:34:08 2001 +0000 +++ b/dec_video.c Wed Aug 08 13:38:16 2001 +0000 @@ -570,7 +570,6 @@ } if(verbose) printf("OK!\n"); // sh_video=d_video->sh;sh_video->ds=d_video; - sh_video->format=0x10000001; // mpeg video mpeg2_init(); // ========= Read & process sequence header & extension ============ videobuffer=shmem_alloc(VIDEOBUFFER_SIZE); @@ -610,6 +609,7 @@ } } // display info: + sh_video->format=picture->mpeg1?0x10000001:0x10000002; // mpeg video sh_video->fps=frameratecode2framerate[picture->frame_rate_code]*0.0001f; if(!sh_video->fps){ // if(!force_fps){