diff options
| author | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-16 01:35:44 +0000 |
|---|---|---|
| committer | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-16 01:35:44 +0000 |
| commit | 44b2073259235e5078e177995e9ee8091241f0c4 (patch) | |
| tree | 2236b8d95a5c9ac67878b525515635eac5bbb817 /dll_init.c | |
| parent | fd80ec7a2d180e88438169ebc2eb5b9a1d136f58 (diff) | |
| download | mpv-44b2073259235e5078e177995e9ee8091241f0c4.tar.bz2 mpv-44b2073259235e5078e177995e9ee8091241f0c4.tar.xz | |
fixed yuvhack
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@468 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'dll_init.c')
| -rw-r--r-- | dll_init.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/dll_init.c b/dll_init.c index 2b4aeef371..818a8ed238 100644 --- a/dll_init.c +++ b/dll_init.c @@ -146,6 +146,7 @@ int init_video_codec(){ case IMGFMT_I420: case IMGFMT_IYUV: sh_video->o_bih.biBitCount=12; + break; /* packed format */ case IMGFMT_YUY2: @@ -188,11 +189,8 @@ int init_video_codec(){ sh_video->o_bih.biHeight=-sh_video->bih->biHeight; // flip image! } - // this looks suspicious :-) - if(!(outfmt == IMGFMT_YUY2 && (sh_video->codec->outflags[sh_video->outfmtidx] & CODECS_FLAG_YUVHACK)) - && (outfmt & IMGFMT_RGB_MASK) != IMGFMT_RGB && (outfmt & IMGFMT_BGR_MASK ) != IMGFMT_BGR) { + if(!(sh_video->codec->outflags[sh_video->outfmtidx] & CODECS_FLAG_YUVHACK)) sh_video->o_bih.biCompression = outfmt; - } if(verbose) { printf("Starting decompression, format:\n"); @@ -246,7 +244,7 @@ int init_video_codec(){ return 0; } - if(outfmt==IMGFMT_YUY2 && (sh_video->codec->outflags[sh_video->outfmtidx]&CODECS_FLAG_YUVHACK)) + if(sh_video->codec->outflags[sh_video->outfmtidx] & CODECS_FLAG_YUVHACK) sh_video->o_bih.biCompression = mmioFOURCC('Y','U','Y','2'); // avi_header.our_in_buffer=malloc(avi_header.video.dwSuggestedBufferSize); // FIXME!!!! |