Merge svn changes up to 27824

Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c

7 files changed, 21 insertions, 16 deletions

diff --git a/libmpdemux/asfguid.h b/libmpdemux/asfguid.h
index 6430f738e5..e9b8b08567 100644
--- a/libmpdemux/asfguid.h
+++ b/libmpdemux/asfguid.h
@@ -90,14 +90,4 @@ static int find_asf_guid(char *buf, const char *guid, int cur_pos, int buf_len)
   return -1;
 }
 
-static int find_backwards_asf_guid(char *buf, const char *guid, int cur_pos)
-{
-  int i;
-  for (i=cur_pos-16; i>0; i--) {
-    if (memcmp(&buf[i], guid, 16) == 0)
-      return i + 16 + 8; // point after guid + length
-  }
-  return -1;
-}
-
 #endif /* MPLAYER_ASFGUID_H */
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c
index 93bd1354a9..46a7f8831a 100644
--- a/libmpdemux/asfheader.c
+++ b/libmpdemux/asfheader.c
@@ -352,6 +352,16 @@ static int asf_init_audio_stream(demuxer_t *demuxer,struct asf_priv* asf, sh_aud
   return 1;
 }
 
+static int find_backwards_asf_guid(char *buf, const char *guid, int cur_pos)
+{
+  int i;
+  for (i=cur_pos-16; i>0; i--) {
+    if (memcmp(&buf[i], guid, 16) == 0)
+      return i + 16 + 8; // point after guid + length
+  }
+  return -1;
+}
+
 int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf){
   int hdr_len = asf->header.objh.size - sizeof(asf->header);
   int hdr_skip = 0;
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index 57fa0d340c..a1371aa5f1 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -392,7 +392,6 @@ static int demux_audio_open(demuxer_t* demuxer) {
     l -= 16;
     if (l >= 2) {
       w->cbSize = stream_read_word_le(s);
-      if (w->cbSize < 0) w->cbSize = 0;
       l -= 2;
       if (l < w->cbSize) {
         mp_msg(MSGT_DEMUX,MSGL_ERR,"[demux_audio] truncated extradata (%d < %d)\n",
diff --git a/libmpdemux/demux_nut.c b/libmpdemux/demux_nut.c
index 6ebec33d10..53d80b0f68 100644
--- a/libmpdemux/demux_nut.c
+++ b/libmpdemux/demux_nut.c
@@ -86,8 +86,6 @@ static demuxer_t * demux_open_nut(demuxer_t * demuxer) {
 	while ((ret = nut_read_headers(nut, &s, NULL)) == NUT_ERR_EAGAIN);
 	if (ret) {
 		mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", nut_error(ret));
-		nut_demuxer_uninit(nut);
-		free(priv);
 		return NULL;
 	}
 
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp
index 7ec42db75a..99fdb1c39f 100644
--- a/libmpdemux/demux_rtp.cpp
+++ b/libmpdemux/demux_rtp.cpp
@@ -372,7 +372,7 @@ extern "C" void demux_close_rtp(demuxer_t* demuxer) {
 
 ////////// Extra routines that help implement the above interface functions:
 
-#define MAX_RTP_FRAME_SIZE 50000
+#define MAX_RTP_FRAME_SIZE 5000000
     // >= the largest conceivable frame composed from one or more RTP packets
 
 static void afterReading(void* clientData, unsigned frameSize,
diff --git a/libmpdemux/demux_ty_osd.c b/libmpdemux/demux_ty_osd.c
index db9911c865..56d5d7459a 100644
--- a/libmpdemux/demux_ty_osd.c
+++ b/libmpdemux/demux_ty_osd.c
@@ -574,14 +574,14 @@ static char TY_XDS    [ 8 ][ 25 ][ 34 ];
 static char TY_XDS_new[ 8 ][ 25 ][ 34 ];
 
 // Array of [ MPAARating|TVRating ][ NumberRatings ]
-static const char const *TY_XDS_CHIP[ 2 ][ 8 ] = 
+static const char * const TY_XDS_CHIP[ 2 ][ 8 ] = 
 {
    { "(NOT APPLICABLE)", "G", "PG", "PG-13", "R", "NC-17", "X", "(NOT RATED)" },
    { "(NOT RATED)", "TV-Y", "TV-Y7", "TV-G", "TV-PG", "TV-14", "TV-MA", 
       "(NOT RATED)" }
 };
 
-static const char const *TY_XDS_modes[] = 
+static const char * const TY_XDS_modes[] = 
 {
   "CURRENT",                        // 01h-02h current program
   "FUTURE ",                        // 03h-04h future program
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 82e1577018..3f2eb70585 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -10,6 +10,14 @@
 
 struct MPOpts;
 
+#ifdef HAVE_BUILTIN_EXPECT
+#define likely(x) __builtin_expect ((x) != 0, 1)
+#define unlikely(x) __builtin_expect ((x) != 0, 0)
+#else
+#define likely(x) (x)
+#define unlikely(x) (x)
+#endif
+
 #define MAX_PACKS 4096
 #define MAX_PACK_BYTES 0x8000000  // 128 MiB