Mercurial > mplayer.hg

changeset 15:2184c8945d42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
query libvo for YV12 too
author arpi_esp
date Tue, 27 Feb 2001 01:12:05 +0000
parents f9f230786958
children 749da7e974a3
files libvo/vo_md5.c libvo/vo_pgm.c mplayer.c
diffstat 3 files changed, 19 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_md5.c	Tue Feb 27 01:09:22 2001 +0000
+++ b/libvo/vo_md5.c	Tue Feb 27 01:12:05 2001 +0000
@@ -90,10 +90,10 @@
 static uint32_t
 query_format(uint32_t format)
 {
-    switch(format){
-    case IMGFMT_YV12:
-        return 1;
-    }
+//    switch(format){
+//    case IMGFMT_YV12:
+//        return 1;
+//    }
     return 0;
 }
 
--- a/libvo/vo_pgm.c	Tue Feb 27 01:09:22 2001 +0000
+++ b/libvo/vo_pgm.c	Tue Feb 27 01:12:05 2001 +0000
@@ -97,12 +97,12 @@
 static uint32_t
 query_format(uint32_t format)
 {
-    switch(format){
-    case IMGFMT_YV12:
+//    switch(format){
+//    case IMGFMT_YV12:
 //    case IMGFMT_RGB|24:
 //    case IMGFMT_BGR|24:
-        return 1;
-    }
+//        return 1;
+//    }
     return 0;
 }
 
--- a/mplayer.c	Tue Feb 27 01:09:22 2001 +0000
+++ b/mplayer.c	Tue Feb 27 01:12:05 2001 +0000
@@ -782,8 +782,13 @@
    break;
  }
  case 3: {  // OpenDivX
+   out_fmt=IMGFMT_YV12;
+   if(!video_out->query_format(out_fmt)) {
+     printf("Sorry, selected video_out device is incompatible with this codec!\n");
+     exit(1);
+   }
+
    if(verbose) printf("OpenDivX video codec\n");
-   out_fmt=IMGFMT_YV12;
    { DEC_PARAM dec_param;
      DEC_SET dec_set;
 	dec_param.x_dim = avi_header.bih.biWidth;
@@ -818,6 +823,11 @@
    break;
  }
  case 1: {
+   out_fmt=IMGFMT_YV12;
+   if(!video_out->query_format(out_fmt)) {
+     printf("Sorry, selected video_out device is incompatible with this codec!\n");
+     exit(1);
+   }
    // Find sequence_header first:
    if(verbose) printf("Searching for sequence header... ");fflush(stdout);
    while(1){
@@ -860,7 +870,6 @@
     picture->bitrate*0.5f,
     picture->bitrate/16.0f );
    // display info:
-   out_fmt=IMGFMT_YV12;
 //   movie_size_x=picture->coded_picture_width;
    movie_size_x=picture->display_picture_width;
    movie_size_y=picture->display_picture_height;