[MPlayer-cvslog] r38177 - in trunk: Changelog libvo/vo_jpeg.c libvo/vo_md5sum.c libvo/vo_null.c libvo/vo_png.c libvo/vo_pnm.c libvo/vo_tga.c libvo/vo_yuv4mpeg.c

[ib]

Author: ib
Date: Thu Feb  6 18:41:51 2020
New Revision: 38177

Log:
Revert r38168.

Although these drivers work with the GUI (even without additional
configuration), the GUI does not get any events, which causes it
to neither react nor be able to be stopped during playback.

Modified:
   trunk/Changelog
   trunk/libvo/vo_jpeg.c
   trunk/libvo/vo_md5sum.c
   trunk/libvo/vo_null.c
   trunk/libvo/vo_png.c
   trunk/libvo/vo_pnm.c
   trunk/libvo/vo_tga.c
   trunk/libvo/vo_yuv4mpeg.c

Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog	Thu Feb  6 17:41:36 2020	(r38176)
+++ trunk/Changelog	Thu Feb  6 18:41:51 2020	(r38177)
@@ -8,7 +8,6 @@ MPlayer
     * Fix wrongly sized video window after leaving fullscreen mode
     * Clear screen when switching to fullscreen mode using the x11
       video output driver
-    * Enable video output drivers which write to files
     * Command line option -fs is now recognized in addition to the
       GUI option load_fullscreen
     * Use correct visual in OpenGL video output driver for X11

Modified: trunk/libvo/vo_jpeg.c
==============================================================================
--- trunk/libvo/vo_jpeg.c	Thu Feb  6 17:41:36 2020	(r38176)
+++ trunk/libvo/vo_jpeg.c	Thu Feb  6 18:41:51 2020	(r38177)
@@ -396,8 +396,6 @@ static int control(uint32_t request, voi
     switch (request) {
         case VOCTRL_QUERY_FORMAT:
             return query_format(*((uint32_t*)data));
-        case VOCTRL_GUISUPPORT:
-            return VO_TRUE;
     }
     return VO_NOTIMPL;
 }

Modified: trunk/libvo/vo_md5sum.c
==============================================================================
--- trunk/libvo/vo_md5sum.c	Thu Feb  6 17:41:36 2020	(r38176)
+++ trunk/libvo/vo_md5sum.c	Thu Feb  6 18:41:51 2020	(r38177)
@@ -255,8 +255,6 @@ static int control(uint32_t request, voi
             return query_format(*((uint32_t*)data));
         case VOCTRL_DRAW_IMAGE:
             return draw_image(data);
-        case VOCTRL_GUISUPPORT:
-            return VO_TRUE;
     }
     return VO_NOTIMPL;
 }

Modified: trunk/libvo/vo_null.c
==============================================================================
--- trunk/libvo/vo_null.c	Thu Feb  6 17:41:36 2020	(r38176)
+++ trunk/libvo/vo_null.c	Thu Feb  6 18:41:51 2020	(r38177)
@@ -100,8 +100,6 @@ static int control(uint32_t request, voi
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
     return query_format(*((uint32_t*)data));
-  case VOCTRL_GUISUPPORT:
-    return VO_TRUE;
   }
   return VO_NOTIMPL;
 }

Modified: trunk/libvo/vo_png.c
==============================================================================
--- trunk/libvo/vo_png.c	Thu Feb  6 17:41:36 2020	(r38176)
+++ trunk/libvo/vo_png.c	Thu Feb  6 18:41:51 2020	(r38177)
@@ -262,8 +262,6 @@ static int control(uint32_t request, voi
     return draw_image(data);
   case VOCTRL_QUERY_FORMAT:
     return query_format(*((uint32_t*)data));
-  case VOCTRL_GUISUPPORT:
-      return VO_TRUE;
   }
   return VO_NOTIMPL;
 }

Modified: trunk/libvo/vo_pnm.c
==============================================================================
--- trunk/libvo/vo_pnm.c	Thu Feb  6 17:41:36 2020	(r38176)
+++ trunk/libvo/vo_pnm.c	Thu Feb  6 18:41:51 2020	(r38177)
@@ -532,8 +532,6 @@ static int control(uint32_t request, voi
             return query_format(*((uint32_t*)data));
         case VOCTRL_DRAW_IMAGE:
             return draw_image(data);
-        case VOCTRL_GUISUPPORT:
-            return VO_TRUE;
     }
     return VO_NOTIMPL;
 }

Modified: trunk/libvo/vo_tga.c
==============================================================================
--- trunk/libvo/vo_tga.c	Thu Feb  6 17:41:36 2020	(r38176)
+++ trunk/libvo/vo_tga.c	Thu Feb  6 18:41:51 2020	(r38177)
@@ -219,9 +219,6 @@ static int control(uint32_t request, voi
 
       case VOCTRL_QUERY_FORMAT:
           return query_format(*((uint32_t*)data));
-
-      case VOCTRL_GUISUPPORT:
-          return VO_TRUE;
   }
   return VO_NOTIMPL;
 }

Modified: trunk/libvo/vo_yuv4mpeg.c
==============================================================================
--- trunk/libvo/vo_yuv4mpeg.c	Thu Feb  6 17:41:36 2020	(r38176)
+++ trunk/libvo/vo_yuv4mpeg.c	Thu Feb  6 18:41:51 2020	(r38177)
@@ -301,8 +301,6 @@ static int control(uint32_t request, voi
     return query_format(*((uint32_t*)data));
   case VOCTRL_DUPLICATE_FRAME:
     return write_last_frame();
-  case VOCTRL_GUISUPPORT:
-      return VO_TRUE;
   }
   return VO_NOTIMPL;
 }