[MPlayer-cvslog] r32722 - trunk/mplayer.c

cboesch subversion at mplayerhq.hu
Sun Dec 19 15:15:45 CET 2010


Author: cboesch
Date: Sun Dec 19 15:15:44 2010
New Revision: 32722

Log:
Simplify video format condition in get_metadata.

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Sun Dec 19 15:09:21 2010	(r32721)
+++ trunk/mplayer.c	Sun Dec 19 15:15:44 2010	(r32722)
@@ -465,16 +465,10 @@ char *get_metadata (metadata_t type) {
     else if (sh_video->format == 0x10000005)
       return strdup("h264");
     else if (sh_video->format >= 0x20202020)
-    {
       snprintf(meta, sizeof(meta), "%.4s", (char *) &sh_video->format);
-      return strdup(meta);
-    }
     else
-    {
       snprintf(meta, sizeof(meta), "0x%08X", sh_video->format);
-      return strdup(meta);
-    }
-    break;
+    return strdup(meta);
 
   case META_VIDEO_BITRATE:
     snprintf(meta, sizeof(meta), "%d kbps", (int) (sh_video->i_bps * 8 / 1024));


More information about the MPlayer-cvslog mailing list