[minimyth-commits] [minimyth commit] r5167 - - Updated packages lib/ffmpeg and mediaplayers/mplayer-svn.

Wed, 15 Jul 2009 15:44:53 -0700 

Author: pebender
Date: Wed Jul 15 13:48:42 2009
New Revision: 5167

Modified:
    trunk/gar-minimyth/html/minimyth/document-changelog.txt
    trunk/gar-minimyth/html/minimyth/index.html
    trunk/gar-minimyth/script/lib/ffmpeg/Makefile
    trunk/gar-minimyth/script/lib/ffmpeg/checksums
     
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-h264_vaapi_take_19.patch
    trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg.patch.gar
    trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
     
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-gcc_4.4.0_hack.patch
     
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-vaapi_20090616.patch
    trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk

Log:
- Updated packages lib/ffmpeg and mediaplayers/mplayer-svn.



Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt     (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt     Wed Jul 15  
13:48:42 2009
@@ -41,8 +41,10 @@
  Updated packages
      Updated disk/e2fsprogs.
      Updated lib/dbus.
+    Updated lib/ffmpeg.
      Updated lib/libuuid.
      Updated lib/libvorbis.
+    Updated mediaplayers/mplayer-svn.
      Updated perl/perl-libwww-perl.
      Updated perl/perl-WWW-Curl.
      Updated system/lirc.

Modified: trunk/gar-minimyth/html/minimyth/index.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/index.html (original)
+++ trunk/gar-minimyth/html/minimyth/index.html Wed Jul 15 13:48:42 2009
@@ -58,8 +58,8 @@
              </li>
              <li><a  
href="http://home.kabelfoon.nl/~moongies/streamtuned.html";>MythStream</a>  
<strong>0.18_1</strong></li>
              <li>
-              <a href="http://www.mplayerhq.hu/";>MPlayer</a> <strong>SVN  
29410</strong> and
-              <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN  
19344</strong>
+              <a href="http://www.mplayerhq.hu/";>MPlayer</a> <strong>SVN  
29418</strong> and
+              <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN  
19437</strong>
              </li>
              <li>
                <a href="http://www.mplayerhq.hu/";>MPlayer</a>  
<strong>1.0rc2</strong> with patches to add
@@ -70,12 +70,12 @@
              </li>
              <li>
                <a href="http://www.videolan.org/";>VLC</a>  
<strong>1.0.0</strong> and
-              <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN  
19344</strong>
+              <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN  
19437</strong>
              </li>
              <li>
                <a href="http://www.xine-project.org/";>xine-ui</a>  
<strong>0.99.5</strong>,
                <a href="http://www.xine-project.org/";>xine-lib</a>  
<strong>1.1.16.3</strong> and
-              <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN  
19344</strong>
+              <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN  
19437</strong>
              </li>
              <li>
                <a href="http://fceultra.sourceforge.net/";>FCE Ultra</a>  
<strong>0.98.13-pre</strong>
@@ -196,7 +196,7 @@
                alt="Valid CSS!"      height="31" width="88" /></a>
          </div>
          <div class="version">
-          Last Updated on 2009-07-14
+          Last Updated on 2009-07-15
            <br />
             
&lt;&nbsp;mailto&nbsp;:&nbsp;webmaster&nbsp;at&nbsp;minimyth&nbsp;dot&nbsp;org&nbsp;&gt;
          </div>

Modified: trunk/gar-minimyth/script/lib/ffmpeg/Makefile
==============================================================================
--- trunk/gar-minimyth/script/lib/ffmpeg/Makefile       (original)
+++ trunk/gar-minimyth/script/lib/ffmpeg/Makefile       Wed Jul 15 13:48:42 2009
@@ -1,5 +1,5 @@
  GARNAME = ffmpeg
-GARVERSION = 19334.$(MPLAYER_TRUNK_VERSION)
+GARVERSION = 19437.$(MPLAYER_TRUNK_VERSION)
  CATEGORIES = lib
  MASTER_SITES = svn://svn.ffmpeg.org/
  DISTFILES = $(DISTNAME).tar.bz2
@@ -79,8 +79,6 @@
        --enable-filters \
        --disable-avisynth \
        --enable-bzlib \
-       --disable-libamr-nb \
-       --disable-libamr-wb \
        --disable-libopencore-amrnb \
        --disable-libopencore-amrwb \
        --disable-libdc1394 \
@@ -108,6 +106,7 @@
        --nm="$(NM)" \
        --as="$(AS)" \
        --cc="$(CC)" \
+       --ld="$(CC)" \
        --host-cc="$(build_CC)" \
        --host-cflags="$(build_CFLAGS)" \
        --host-ldflags="$(build_LDFLAGS)" \

Modified: trunk/gar-minimyth/script/lib/ffmpeg/checksums
==============================================================================
--- trunk/gar-minimyth/script/lib/ffmpeg/checksums      (original)
+++ trunk/gar-minimyth/script/lib/ffmpeg/checksums      Wed Jul 15 13:48:42 2009
@@ -1,2 +1,2 @@
-e45c33d8a9d991afc8f6cab76d3452ab  download/ffmpeg-h264_vaapi_take_19.patch
-b485be68976cece0541b7fd3c72e7b8d  download/ffmpeg.patch.gar
+11363ae37f1f62658dc5457b5d2404d7  download/ffmpeg-h264_vaapi_take_19.patch
+20c61567263f709f798a21af6cd96f86  download/ffmpeg.patch.gar

Modified:  
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-h264_vaapi_take_19.patch
==============================================================================
---  
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-h264_vaapi_take_19.patch      
 
(original)
+++  
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-h264_vaapi_take_19.patch      
 
Wed Jul 15 13:48:42 2009
@@ -1,6 +1,6 @@
-diff -Naur ffmpeg-19334.29410-old/libavcodec/allcodecs.c  
ffmpeg-19334.29410-new/libavcodec/allcodecs.c
---- ffmpeg-19334.29410-old/libavcodec/allcodecs.c      2009-07-03  
10:09:27.000000000 -0700
-+++ ffmpeg-19334.29410-new/libavcodec/allcodecs.c      2009-07-03  
10:10:16.000000000 -0700
+diff -Naur ffmpeg-19437.29418-old/libavcodec/allcodecs.c  
ffmpeg-19437.29418-new/libavcodec/allcodecs.c
+--- ffmpeg-19437.29418-old/libavcodec/allcodecs.c      2009-07-15  
08:45:40.000000000 -0700
++++ ffmpeg-19437.29418-new/libavcodec/allcodecs.c      2009-07-15  
08:52:55.000000000 -0700
  @@ -55,6 +55,7 @@

       /* hardware accelerators */
@@ -9,20 +9,20 @@
       REGISTER_HWACCEL (MPEG2_VAAPI, mpeg2_vaapi);
       REGISTER_HWACCEL (MPEG4_VAAPI, mpeg4_vaapi);
       REGISTER_HWACCEL (VC1_VAAPI, vc1_vaapi);
-diff -Naur ffmpeg-19334.29410-old/libavcodec/Makefile  
ffmpeg-19334.29410-new/libavcodec/Makefile
---- ffmpeg-19334.29410-old/libavcodec/Makefile 2009-07-03  
10:09:27.000000000 -0700
-+++ ffmpeg-19334.29410-new/libavcodec/Makefile 2009-07-03  
10:10:16.000000000 -0700
-@@ -108,6 +108,7 @@
+diff -Naur ffmpeg-19437.29418-old/libavcodec/Makefile  
ffmpeg-19437.29418-new/libavcodec/Makefile
+--- ffmpeg-19437.29418-old/libavcodec/Makefile 2009-07-15  
08:45:40.000000000 -0700
++++ ffmpeg-19437.29418-new/libavcodec/Makefile 2009-07-15  
08:52:55.000000000 -0700
+@@ -109,6 +109,7 @@
   OBJS-$(CONFIG_H263P_ENCODER)           += mpegvideo_enc.o motion_est.o  
ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
   OBJS-$(CONFIG_H264_DECODER)            += h264.o h264idct.o h264pred.o  
h264_parser.o cabac.o mpegvideo.o error_resilience.o
   OBJS-$(CONFIG_H264_ENCODER)            += h264enc.o h264dspenc.o
  +OBJS-$(CONFIG_H264_VAAPI_HWACCEL)      += h264.o h264idct.o h264pred.o  
h264_parser.o cabac.o mpegvideo.o error_resilience.o vaapi.o vaapi_h264.o
- OBJS-$(CONFIG_H264_VDPAU_DECODER)      += h264.o h264idct.o h264pred.o  
h264_parser.o cabac.o mpegvideo.o error_resilience.o
   OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o
   OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.o
-diff -Naur ffmpeg-19334.29410-old/libavcodec/vaapi_h264.c  
ffmpeg-19334.29410-new/libavcodec/vaapi_h264.c
---- ffmpeg-19334.29410-old/libavcodec/vaapi_h264.c     1969-12-31  
16:00:00.000000000 -0800
-+++ ffmpeg-19334.29410-new/libavcodec/vaapi_h264.c     2009-07-03  
10:10:16.000000000 -0700
+ OBJS-$(CONFIG_IDCIN_DECODER)           += idcinvideo.o
+diff -Naur ffmpeg-19437.29418-old/libavcodec/vaapi_h264.c  
ffmpeg-19437.29418-new/libavcodec/vaapi_h264.c
+--- ffmpeg-19437.29418-old/libavcodec/vaapi_h264.c     1969-12-31  
16:00:00.000000000 -0800
++++ ffmpeg-19437.29418-new/libavcodec/vaapi_h264.c     2009-07-15  
08:52:55.000000000 -0700
  @@ -0,0 +1,360 @@
  +/*
  + * H.264 HW decode acceleration through VAAPI

Modified: trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg.patch.gar
==============================================================================
--- trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg.patch.gar (original)
+++ trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg.patch.gar Wed Jul 15  
13:48:42 2009
@@ -1,7 +1,7 @@
-diff -Naur ffmpeg-19334.29410-old/configure  
ffmpeg-19334.29410-new/configure
---- ffmpeg-19334.29410-old/configure   2009-07-03 10:10:16.000000000 -0700
-+++ ffmpeg-19334.29410-new/configure   2009-07-03 10:10:16.000000000 -0700
-@@ -742,11 +742,11 @@
+diff -Naur ffmpeg-19437.29418-old/configure  
ffmpeg-19437.29418-new/configure
+--- ffmpeg-19437.29418-old/configure   2009-07-15 08:52:55.000000000 -0700
++++ ffmpeg-19437.29418-new/configure   2009-07-15 08:52:55.000000000 -0700
+@@ -758,11 +758,11 @@
       func=$4
       shift 4
       disable $cfg
@@ -16,7 +16,7 @@
           check_lib "$@" $header $func && enable $cfg
       fi
       return $err
-@@ -2143,7 +2143,7 @@
+@@ -2181,7 +2181,7 @@

   disable sdl_too_old
   disable sdl

Modified: trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums        
(original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums        Wed Jul 
15  
13:48:42 2009
@@ -1,2 +1,2 @@
-cc59524be55dfd9a2c373378fbfa2e08  download/MPlayer-gcc_4.4.0_hack.patch
-8f2522f02c754cd422c39ed24e355685  download/MPlayer-vaapi_20090616.patch
+281b08592d751d99402250cfd78e569c  download/MPlayer-gcc_4.4.0_hack.patch
+f765c704c34045f3b626eda3685a81a8  download/MPlayer-vaapi_20090616.patch

Modified:  
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-gcc_4.4.0_hack.patch
==============================================================================
---  
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-gcc_4.4.0_hack.patch
    
(original)
+++  
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-gcc_4.4.0_hack.patch
    
Wed Jul 15 13:48:42 2009
@@ -1,6 +1,6 @@
-diff -Naur MPlayer-29410-old/configure MPlayer-29410-new/configure
---- MPlayer-29410-old/configure        2009-07-03 10:12:32.000000000 -0700
-+++ MPlayer-29410-new/configure        2009-07-03 10:15:30.000000000 -0700
+diff -Naur MPlayer-29418-old/configure MPlayer-29418-new/configure
+--- MPlayer-29418-old/configure        2009-07-15 08:54:01.000000000 -0700
++++ MPlayer-29418-new/configure        2009-07-15 08:55:35.000000000 -0700
  @@ -2410,8 +2410,8 @@
   __attribute__((noinline)) static int foo3(int i1, int i2, int i3) {  
return i3; }
   int main(void) { return foo3(1,2,3) == 3 ? 0 : 1; }

Modified:  
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-vaapi_20090616.patch
==============================================================================
---  
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-vaapi_20090616.patch
    
(original)
+++  
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-vaapi_20090616.patch
    
Wed Jul 15 13:48:42 2009
@@ -1,6 +1,6 @@
-diff -Naur MPlayer-29410-old/cfg-common-opts.h  
MPlayer-29410-new/cfg-common-opts.h
---- MPlayer-29410-old/cfg-common-opts.h        2009-07-03 10:15:30.000000000 
-0700
-+++ MPlayer-29410-new/cfg-common-opts.h        2009-07-03 10:15:31.000000000 
-0700
+diff -Naur MPlayer-29418-old/cfg-common-opts.h  
MPlayer-29418-new/cfg-common-opts.h
+--- MPlayer-29418-old/cfg-common-opts.h        2009-07-15 08:55:35.000000000 
-0700
++++ MPlayer-29418-new/cfg-common-opts.h        2009-07-15 08:55:36.000000000 
-0700
  @@ -227,6 +227,7 @@
   //   {"ac", &audio_codec, CONF_TYPE_STRING, 0, 0, 0, NULL},
        {"ac", &audio_codec_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
@@ -9,9 +9,9 @@

        // postprocessing:
   #ifdef CONFIG_LIBAVCODEC
-diff -Naur MPlayer-29410-old/codec-cfg.c MPlayer-29410-new/codec-cfg.c
---- MPlayer-29410-old/codec-cfg.c      2009-07-03 10:15:30.000000000 -0700
-+++ MPlayer-29410-new/codec-cfg.c      2009-07-03 10:15:31.000000000 -0700
+diff -Naur MPlayer-29418-old/codec-cfg.c MPlayer-29418-new/codec-cfg.c
+--- MPlayer-29418-old/codec-cfg.c      2009-07-15 08:55:35.000000000 -0700
++++ MPlayer-29418-new/codec-cfg.c      2009-07-15 08:55:36.000000000 -0700
  @@ -182,6 +182,13 @@
                {"IDCT_MPEG2",IMGFMT_XVMC_IDCT_MPEG2},
                {"MOCO_MPEG2",IMGFMT_XVMC_MOCO_MPEG2},
@@ -26,9 +26,9 @@
                {"VDPAU_MPEG1",IMGFMT_VDPAU_MPEG1},
                {"VDPAU_MPEG2",IMGFMT_VDPAU_MPEG2},
                {"VDPAU_H264",IMGFMT_VDPAU_H264},
-diff -Naur MPlayer-29410-old/configure MPlayer-29410-new/configure
---- MPlayer-29410-old/configure        2009-07-03 10:15:30.000000000 -0700
-+++ MPlayer-29410-new/configure        2009-07-03 10:15:31.000000000 -0700
+diff -Naur MPlayer-29418-old/configure MPlayer-29418-new/configure
+--- MPlayer-29418-old/configure        2009-07-15 08:55:35.000000000 -0700
++++ MPlayer-29418-new/configure        2009-07-15 08:55:36.000000000 -0700
  @@ -354,6 +354,9 @@
     --disable-muxer=MUXER     disable specified FFmpeg muxer
     --enable-muxer=MUXER      enable specified FFmpeg muxer
@@ -137,7 +137,7 @@
   $(echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' |  
sed 's/^/CONFIG_/;s/$/=yes/')
   $(echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' |  
sed 's/^/CONFIG_/;s/$/=yes/')
   $(echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' |  
sed 's/^/CONFIG_/;s/$/=yes/')
-@@ -8773,6 +8807,7 @@
+@@ -8774,6 +8808,7 @@
   $def_tdfxvid
   $def_tga
   $def_v4l2
@@ -145,7 +145,7 @@
   $def_vdpau
   $def_vesa
   $def_vidix
-@@ -8890,6 +8925,7 @@
+@@ -8891,6 +8926,7 @@
   $def_x264_lavc
   $def_xvid_lavc

@@ -153,7 +153,7 @@
   $(ff_config_enable "$_libavdecoders_all" "$_libavdecoders")
   $(ff_config_enable "$_libavencoders_all" "$_libavencoders")
   $(ff_config_enable "$_libavparsers_all"  "$_libavparsers")
-@@ -8898,13 +8934,6 @@
+@@ -8899,13 +8935,6 @@
   $(ff_config_enable "$_libavprotocols_all" "$_libavprotocols")
   $(ff_config_enable "$_libavbsfs_all" "$_libavbsfs")

@@ -167,9 +167,9 @@
   #endif /* MPLAYER_CONFIG_H */
   EOF

-diff -Naur MPlayer-29410-old/etc/codecs.conf  
MPlayer-29410-new/etc/codecs.conf
---- MPlayer-29410-old/etc/codecs.conf  2009-07-03 10:15:30.000000000 -0700
-+++ MPlayer-29410-new/etc/codecs.conf  2009-07-03 10:15:31.000000000 -0700
+diff -Naur MPlayer-29418-old/etc/codecs.conf  
MPlayer-29418-new/etc/codecs.conf
+--- MPlayer-29418-old/etc/codecs.conf  2009-07-15 08:55:35.000000000 -0700
++++ MPlayer-29418-new/etc/codecs.conf  2009-07-15 08:55:36.000000000 -0700
  @@ -164,6 +164,7 @@
     fourcc LMP2 ; Lead mpeg2 in avi
     driver ffmpeg
@@ -218,9 +218,9 @@
     out YV12,I420,IYUV

   videocodec ffzygo
-diff -Naur MPlayer-29410-old/fmt-conversion.c  
MPlayer-29410-new/fmt-conversion.c
---- MPlayer-29410-old/fmt-conversion.c 2009-07-03 10:15:30.000000000 -0700
-+++ MPlayer-29410-new/fmt-conversion.c 2009-07-03 10:15:31.000000000 -0700
+diff -Naur MPlayer-29418-old/fmt-conversion.c  
MPlayer-29418-new/fmt-conversion.c
+--- MPlayer-29418-old/fmt-conversion.c 2009-07-15 08:55:35.000000000 -0700
++++ MPlayer-29418-new/fmt-conversion.c 2009-07-15 08:55:36.000000000 -0700
  @@ -18,12 +18,14 @@

   #include "mp_msg.h"
@@ -271,9 +271,9 @@
               break;
       fmt = conversion_map[i].fmt;
       if (!fmt)
-diff -Naur MPlayer-29410-old/fmt-conversion.h  
MPlayer-29410-new/fmt-conversion.h
---- MPlayer-29410-old/fmt-conversion.h 2009-07-03 10:15:30.000000000 -0700
-+++ MPlayer-29410-new/fmt-conversion.h 2009-07-03 10:15:31.000000000 -0700
+diff -Naur MPlayer-29418-old/fmt-conversion.h  
MPlayer-29418-new/fmt-conversion.h
+--- MPlayer-29418-old/fmt-conversion.h 2009-07-15 08:55:35.000000000 -0700
++++ MPlayer-29418-new/fmt-conversion.h 2009-07-15 08:55:36.000000000 -0700
  @@ -4,6 +4,6 @@
   #include "libavutil/avutil.h"

@@ -282,9 +282,9 @@
  +int pixfmt2imgfmt(enum PixelFormat pix_fmt, int codec_id);

   #endif /* MPLAYER_FMT_CONVERSION_H */
-diff -Naur MPlayer-29410-old/gui/mplayer/gtk/opts.c  
MPlayer-29410-new/gui/mplayer/gtk/opts.c
---- MPlayer-29410-old/gui/mplayer/gtk/opts.c   2009-07-03 10:15:30.000000000  
-0700
-+++ MPlayer-29410-new/gui/mplayer/gtk/opts.c   2009-07-03 10:15:31.000000000  
-0700
+diff -Naur MPlayer-29418-old/gui/mplayer/gtk/opts.c  
MPlayer-29418-new/gui/mplayer/gtk/opts.c
+--- MPlayer-29418-old/gui/mplayer/gtk/opts.c   2009-07-15 08:55:35.000000000  
-0700
++++ MPlayer-29418-new/gui/mplayer/gtk/opts.c   2009-07-15 08:55:36.000000000  
-0700
  @@ -63,9 +63,11 @@
          GtkWidget * prEFontName;
          GtkWidget * prEDVDDevice;
@@ -363,9 +363,9 @@
     AddLabel( MSGTR_PREFERENCES_VideoCodecFamily,hbox5 );

     CBVFM=gtk_combo_new();
-diff -Naur MPlayer-29410-old/help/help_mp-en.h  
MPlayer-29410-new/help/help_mp-en.h
---- MPlayer-29410-old/help/help_mp-en.h        2009-07-03 10:15:30.000000000 
-0700
-+++ MPlayer-29410-new/help/help_mp-en.h        2009-07-03 10:15:31.000000000 
-0700
+diff -Naur MPlayer-29418-old/help/help_mp-en.h  
MPlayer-29418-new/help/help_mp-en.h
+--- MPlayer-29418-old/help/help_mp-en.h        2009-07-15 08:55:35.000000000 
-0700
++++ MPlayer-29418-new/help/help_mp-en.h        2009-07-15 08:55:36.000000000 
-0700
  @@ -718,6 +718,7 @@
   #define MSGTR_PREFERENCES_IDX "Rebuild index table, if needed"
   #define MSGTR_PREFERENCES_VideoCodecFamily "Video codec family:"
@@ -382,9 +382,9 @@

   // libmpcodecs/ve_lavc.c
   #define MSGTR_MPCODECS_HighQualityEncodingSelected "[VE_LAVC] High  
quality encoding selected (non-realtime)!\n"
-diff -Naur MPlayer-29410-old/libmpcodecs/dec_video.c  
MPlayer-29410-new/libmpcodecs/dec_video.c
---- MPlayer-29410-old/libmpcodecs/dec_video.c  2009-07-03  
10:15:30.000000000 -0700
-+++ MPlayer-29410-new/libmpcodecs/dec_video.c  2009-07-03  
10:15:31.000000000 -0700
+diff -Naur MPlayer-29418-old/libmpcodecs/dec_video.c  
MPlayer-29418-new/libmpcodecs/dec_video.c
+--- MPlayer-29418-old/libmpcodecs/dec_video.c  2009-07-15  
08:55:35.000000000 -0700
++++ MPlayer-29418-new/libmpcodecs/dec_video.c  2009-07-15  
08:55:36.000000000 -0700
  @@ -39,9 +39,47 @@
   int field_dominance=-1;

@@ -433,9 +433,9 @@
   int get_video_quality_max(sh_video_t *sh_video){
     vf_instance_t* vf=sh_video->vfilter;
     if(vf){
-diff -Naur MPlayer-29410-old/libmpcodecs/dec_video.h  
MPlayer-29410-new/libmpcodecs/dec_video.h
---- MPlayer-29410-old/libmpcodecs/dec_video.h  2009-07-03  
10:15:30.000000000 -0700
-+++ MPlayer-29410-new/libmpcodecs/dec_video.h  2009-07-03  
10:15:31.000000000 -0700
+diff -Naur MPlayer-29418-old/libmpcodecs/dec_video.h  
MPlayer-29418-new/libmpcodecs/dec_video.h
+--- MPlayer-29418-old/libmpcodecs/dec_video.h  2009-07-15  
08:55:35.000000000 -0700
++++ MPlayer-29418-new/libmpcodecs/dec_video.h  2009-07-15  
08:55:36.000000000 -0700
  @@ -3,6 +3,14 @@

   #include "libmpdemux/stheader.h"
@@ -463,9 +463,9 @@
  +extern char *video_hwaccel_name;

   #endif /* MPLAYER_DEC_VIDEO_H */
-diff -Naur MPlayer-29410-old/libmpcodecs/img_format.c  
MPlayer-29410-new/libmpcodecs/img_format.c
---- MPlayer-29410-old/libmpcodecs/img_format.c 2009-07-03  
10:15:30.000000000 -0700
-+++ MPlayer-29410-new/libmpcodecs/img_format.c 2009-07-03  
10:15:31.000000000 -0700
+diff -Naur MPlayer-29418-old/libmpcodecs/img_format.c  
MPlayer-29418-new/libmpcodecs/img_format.c
+--- MPlayer-29418-old/libmpcodecs/img_format.c 2009-07-15  
08:55:35.000000000 -0700
++++ MPlayer-29418-new/libmpcodecs/img_format.c 2009-07-15  
08:55:36.000000000 -0700
  @@ -67,6 +67,14 @@
        case IMGFMT_ZRMJPEGIB: return "Zoran MJPEG bottom field first";
        case IMGFMT_XVMC_MOCO_MPEG2: return "MPEG1/2 Motion Compensation";
@@ -481,9 +481,9 @@
        case IMGFMT_VDPAU_MPEG1: return "MPEG1 VDPAU acceleration";
        case IMGFMT_VDPAU_MPEG2: return "MPEG2 VDPAU acceleration";
        case IMGFMT_VDPAU_H264: return "H.264 VDPAU acceleration";
-diff -Naur MPlayer-29410-old/libmpcodecs/img_format.h  
MPlayer-29410-new/libmpcodecs/img_format.h
---- MPlayer-29410-old/libmpcodecs/img_format.h 2009-07-03  
10:15:30.000000000 -0700
-+++ MPlayer-29410-new/libmpcodecs/img_format.h 2009-07-03  
10:15:31.000000000 -0700
+diff -Naur MPlayer-29418-old/libmpcodecs/img_format.h  
MPlayer-29418-new/libmpcodecs/img_format.h
+--- MPlayer-29418-old/libmpcodecs/img_format.h 2009-07-15  
08:55:35.000000000 -0700
++++ MPlayer-29418-new/libmpcodecs/img_format.h 2009-07-15  
08:55:36.000000000 -0700
  @@ -107,6 +107,26 @@
   #define IMGFMT_XVMC_MOCO_MPEG2 (IMGFMT_XVMC|0x02)
   #define IMGFMT_XVMC_IDCT_MPEG2 (IMGFMT_XVMC|0x82)
@@ -511,9 +511,9 @@
   // VDPAU specific format.
   #define IMGFMT_VDPAU               0x1DC80000
   #define IMGFMT_VDPAU_MASK          0xFFFF0000
-diff -Naur MPlayer-29410-old/libmpcodecs/mp_image.h  
MPlayer-29410-new/libmpcodecs/mp_image.h
---- MPlayer-29410-old/libmpcodecs/mp_image.h   2009-07-03 10:15:30.000000000  
-0700
-+++ MPlayer-29410-new/libmpcodecs/mp_image.h   2009-07-03 10:15:31.000000000  
-0700
+diff -Naur MPlayer-29418-old/libmpcodecs/mp_image.h  
MPlayer-29418-new/libmpcodecs/mp_image.h
+--- MPlayer-29418-old/libmpcodecs/mp_image.h   2009-07-15 08:55:35.000000000  
-0700
++++ MPlayer-29418-new/libmpcodecs/mp_image.h   2009-07-15 08:55:36.000000000  
-0700
  @@ -111,6 +111,7 @@
       // compressed formats
       if(out_fmt == IMGFMT_MPEGPES ||
@@ -522,9 +522,9 @@
          IMGFMT_IS_VDPAU(out_fmt) || IMGFMT_IS_XVMC(out_fmt)){
        mpi->bpp=0;
        return;
-diff -Naur MPlayer-29410-old/libmpcodecs/vd.c  
MPlayer-29410-new/libmpcodecs/vd.c
---- MPlayer-29410-old/libmpcodecs/vd.c 2009-07-03 10:15:30.000000000 -0700
-+++ MPlayer-29410-new/libmpcodecs/vd.c 2009-07-03 10:15:31.000000000 -0700
+diff -Naur MPlayer-29418-old/libmpcodecs/vd.c  
MPlayer-29418-new/libmpcodecs/vd.c
+--- MPlayer-29418-old/libmpcodecs/vd.c 2009-07-15 08:55:35.000000000 -0700
++++ MPlayer-29418-new/libmpcodecs/vd.c 2009-07-15 08:55:36.000000000 -0700
  @@ -345,3 +345,12 @@
     if(vf->draw_slice)
       vf->draw_slice(vf,src,stride,w,h,x,y);
@@ -538,9 +538,9 @@
  +        return ctx;
  +    return NULL;
  +}
-diff -Naur MPlayer-29410-old/libmpcodecs/vd_ffmpeg.c  
MPlayer-29410-new/libmpcodecs/vd_ffmpeg.c
---- MPlayer-29410-old/libmpcodecs/vd_ffmpeg.c  2009-07-03  
10:15:30.000000000 -0700
-+++ MPlayer-29410-new/libmpcodecs/vd_ffmpeg.c  2009-07-03  
10:15:31.000000000 -0700
+diff -Naur MPlayer-29418-old/libmpcodecs/vd_ffmpeg.c  
MPlayer-29418-new/libmpcodecs/vd_ffmpeg.c
+--- MPlayer-29418-old/libmpcodecs/vd_ffmpeg.c  2009-07-15  
08:55:35.000000000 -0700
++++ MPlayer-29418-new/libmpcodecs/vd_ffmpeg.c  2009-07-15  
08:55:36.000000000 -0700
  @@ -14,6 +14,7 @@
   #include "fmt-conversion.h"

@@ -720,9 +720,9 @@
   }
  -#endif /* CONFIG_XVMC || CONFIG_VDPAU */
  +#endif /* CONFIG_XVMC || CONFIG_VAAPI || CONFIG_VDPAU */
-diff -Naur MPlayer-29410-old/libmpcodecs/vd.h  
MPlayer-29410-new/libmpcodecs/vd.h
---- MPlayer-29410-old/libmpcodecs/vd.h 2009-07-03 10:15:30.000000000 -0700
-+++ MPlayer-29410-new/libmpcodecs/vd.h 2009-07-03 10:15:31.000000000 -0700
+diff -Naur MPlayer-29418-old/libmpcodecs/vd.h  
MPlayer-29418-new/libmpcodecs/vd.h
+--- MPlayer-29418-old/libmpcodecs/vd.h 2009-07-15 08:55:35.000000000 -0700
++++ MPlayer-29418-new/libmpcodecs/vd.h 2009-07-15 08:55:36.000000000 -0700
  @@ -34,6 +34,7 @@
   int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int  
preferred_outfmt);
   mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int  
mp_imgflag, int w, int h);
@@ -731,9 +731,9 @@

   #define VDFLAGS_DROPFRAME 3

-diff -Naur MPlayer-29410-old/libmpcodecs/vf.h  
MPlayer-29410-new/libmpcodecs/vf.h
---- MPlayer-29410-old/libmpcodecs/vf.h 2009-07-03 10:15:30.000000000 -0700
-+++ MPlayer-29410-new/libmpcodecs/vf.h 2009-07-03 10:15:31.000000000 -0700
+diff -Naur MPlayer-29418-old/libmpcodecs/vf.h  
MPlayer-29418-new/libmpcodecs/vf.h
+--- MPlayer-29418-old/libmpcodecs/vf.h 2009-07-15 08:55:35.000000000 -0700
++++ MPlayer-29418-new/libmpcodecs/vf.h 2009-07-15 08:55:36.000000000 -0700
  @@ -89,6 +89,7 @@
   #define VFCTRL_GET_PTS         17 /* Return last pts value that reached  
vf_vo*/
   #define VFCTRL_SET_DEINTERLACE 18 /* Set deinterlacing status */
@@ -742,9 +742,9 @@

   #include "vfcap.h"

-diff -Naur MPlayer-29410-old/libmpcodecs/vf_vo.c  
MPlayer-29410-new/libmpcodecs/vf_vo.c
---- MPlayer-29410-old/libmpcodecs/vf_vo.c      2009-07-03 10:15:30.000000000  
-0700
-+++ MPlayer-29410-new/libmpcodecs/vf_vo.c      2009-07-03 10:15:31.000000000  
-0700
+diff -Naur MPlayer-29418-old/libmpcodecs/vf_vo.c  
MPlayer-29418-new/libmpcodecs/vf_vo.c
+--- MPlayer-29418-old/libmpcodecs/vf_vo.c      2009-07-15 08:55:35.000000000  
-0700
++++ MPlayer-29418-new/libmpcodecs/vf_vo.c      2009-07-15 08:55:36.000000000  
-0700
  @@ -151,6 +151,12 @@
        *(double *)data = vf->priv->pts;
        return CONTROL_TRUE;
@@ -766,9 +766,9 @@
          IMGFMT_IS_XVMC(mpi->imgfmt) || IMGFMT_IS_VDPAU(mpi->imgfmt))
        video_out->control(VOCTRL_GET_IMAGE,mpi);
   }
-diff -Naur MPlayer-29410-old/libvo/video_out.c  
MPlayer-29410-new/libvo/video_out.c
---- MPlayer-29410-old/libvo/video_out.c        2009-07-03 10:15:30.000000000 
-0700
-+++ MPlayer-29410-new/libvo/video_out.c        2009-07-03 10:15:31.000000000 
-0700
+diff -Naur MPlayer-29418-old/libvo/video_out.c  
MPlayer-29418-new/libvo/video_out.c
+--- MPlayer-29418-old/libvo/video_out.c        2009-07-15 08:55:35.000000000 
-0700
++++ MPlayer-29418-new/libvo/video_out.c        2009-07-15 08:55:36.000000000 
-0700
  @@ -132,6 +132,7 @@
   extern vo_functions_t video_out_quartz;
   extern vo_functions_t video_out_pnm;
@@ -787,9 +787,9 @@
           NULL
   };

-diff -Naur MPlayer-29410-old/libvo/video_out.h  
MPlayer-29410-new/libvo/video_out.h
---- MPlayer-29410-old/libvo/video_out.h        2009-07-03 10:15:30.000000000 
-0700
-+++ MPlayer-29410-new/libvo/video_out.h        2009-07-03 10:15:31.000000000 
-0700
+diff -Naur MPlayer-29418-old/libvo/video_out.h  
MPlayer-29418-new/libvo/video_out.h
+--- MPlayer-29418-old/libvo/video_out.h        2009-07-15 08:55:35.000000000 
-0700
++++ MPlayer-29418-new/libvo/video_out.h        2009-07-15 08:55:36.000000000 
-0700
  @@ -97,6 +97,10 @@
     int w,h;
   } mp_win_t;
@@ -801,9 +801,9 @@
   #define VO_TRUE              1
   #define VO_FALSE     0
   #define VO_ERROR     -1
-diff -Naur MPlayer-29410-old/libvo/vo_vaapi.c  
MPlayer-29410-new/libvo/vo_vaapi.c
---- MPlayer-29410-old/libvo/vo_vaapi.c 1969-12-31 16:00:00.000000000 -0800
-+++ MPlayer-29410-new/libvo/vo_vaapi.c 2009-07-03 10:15:31.000000000 -0700
+diff -Naur MPlayer-29418-old/libvo/vo_vaapi.c  
MPlayer-29418-new/libvo/vo_vaapi.c
+--- MPlayer-29418-old/libvo/vo_vaapi.c 1969-12-31 16:00:00.000000000 -0800
++++ MPlayer-29418-new/libvo/vo_vaapi.c 2009-07-15 08:55:36.000000000 -0700
  @@ -0,0 +1,656 @@
  +/*
  + * VA API output module
@@ -1461,10 +1461,10 @@
  +    }
  +    return VO_NOTIMPL;
  +}
-diff -Naur MPlayer-29410-old/Makefile MPlayer-29410-new/Makefile
---- MPlayer-29410-old/Makefile 2009-07-03 10:15:30.000000000 -0700
-+++ MPlayer-29410-new/Makefile 2009-07-03 10:15:31.000000000 -0700
-@@ -620,6 +620,7 @@
+diff -Naur MPlayer-29418-old/Makefile MPlayer-29418-new/Makefile
+--- MPlayer-29418-old/Makefile 2009-07-15 08:55:35.000000000 -0700
++++ MPlayer-29418-new/Makefile 2009-07-15 08:55:36.000000000 -0700
+@@ -621,6 +621,7 @@
   SRCS_MPLAYER-$(TGA)           += libvo/vo_tga.c
   SRCS_MPLAYER-$(V4L2)          += libvo/vo_v4l2.c
   SRCS_MPLAYER-$(V4L2)          += libao2/ao_v4l2.c

Modified: trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk    
(original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk   Wed  
Jul 15 13:48:42 2009
@@ -1 +1 @@
-MPLAYER_TRUNK_VERSION=29410
+MPLAYER_TRUNK_VERSION=29418

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to