diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf index 2c5922935e..ce37cbadf2 100644 --- a/DOCS/codecs.conf +++ b/DOCS/codecs.conf @@ -40,7 +40,8 @@ videocodec mpeg12 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 ffodivx 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 --git a/dec_video.c b/dec_video.c index 499e9df527..e6f7221f25 100644 --- a/dec_video.c +++ b/dec_video.c @@ -570,7 +570,6 @@ switch(d_video->demuxer->file_format){ } 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 @@ switch(d_video->demuxer->file_format){ } } // 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){