From 495115f2f11e90b5ad5e94f1326d29244b7b174a Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 27 May 2010 23:21:16 +0000
Subject: [PATCH 1/4] cosmetics: vertical alignment in msg module help output.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31245 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 cfg-common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cfg-common.h b/cfg-common.h
index f910adc5fe..b4e8d718a4 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -353,7 +353,7 @@ const m_option_t msgl_config[]={
     "   netst      - Netstream\n"
     "   muxer      - muxer layer\n"
     "   identify   - identify output\n"
-    "   ass    - libass messages\n"
+    "   ass        - libass messages\n"
     "   statusline - playback/encoding status line\n"
     "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
     {NULL, NULL, 0, 0, 0, 0, NULL}

From 72ba1c8fec36da67fdbede8e8443d810823fdf76 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 27 May 2010 23:36:03 +0000
Subject: [PATCH 2/4] Drop pointles _st suffix from struct mp_cmd_filter and
 mp_cmd_bind_section.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31246 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 input/input.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/input/input.c b/input/input.c
index 0bcd5752af..16a0a20f50 100644
--- a/input/input.c
+++ b/input/input.c
@@ -541,17 +541,17 @@ typedef struct mp_input_fd {
   int pos,size;
 } mp_input_fd_t;
 
-typedef struct mp_cmd_filter_st mp_cmd_filter_t;
+typedef struct mp_cmd_filter mp_cmd_filter_t;
 
-struct mp_cmd_filter_st {
+struct mp_cmd_filter {
   mp_input_cmd_filter filter;
   void* ctx;
   mp_cmd_filter_t* next;
 };
 
-typedef struct mp_cmd_bind_section_st mp_cmd_bind_section_t;
+typedef struct mp_cmd_bind_section mp_cmd_bind_section_t;
 
-struct mp_cmd_bind_section_st {
+struct mp_cmd_bind_section {
   mp_cmd_bind_t* cmd_binds;
   char* section;
   mp_cmd_bind_section_t* next;

From c0262f74351d78545d4e608201b9bb6170891e7d Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 28 May 2010 00:25:28 +0000
Subject: [PATCH 3/4] Drop pointless _t suffix from 'struct lavf_priv'.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31247 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demux_lavf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index dea34b72c2..bc1781c8a0 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -67,7 +67,7 @@ const m_option_t lavfdopts_conf[] = {
 
 #define BIO_BUFFER_SIZE 32768
 
-typedef struct lavf_priv_t{
+typedef struct lavf_priv {
     AVInputFormat *avif;
     AVFormatContext *avfc;
     ByteIOContext *pb;

From f5f6bbaa090d51a3db670abb135d16e91250b1a3 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 28 May 2010 08:39:02 +0000
Subject: [PATCH 4/4] Remove commented-out declaration of nonexisting function
 uGetTimer().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31248 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 osdep/timer.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osdep/timer.h b/osdep/timer.h
index 2e4f2fc8fe..1d8c70e5fd 100644
--- a/osdep/timer.h
+++ b/osdep/timer.h
@@ -24,7 +24,6 @@ extern const char *timer_name;
 void InitTimer(void);
 unsigned int GetTimer(void);
 unsigned int GetTimerMS(void);
-//int uGetTimer(void);
 float GetRelativeTime(void);
 
 int usec_sleep(int usec_delay);