fixed yuvhack

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@468 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi_esp 2001-04-16 01:35:44 +00:00
parent fd80ec7a2d
commit 44b2073259
1 changed files with 3 additions and 5 deletions

View File

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