Revision: 5367 Author: pebender Date: Thu Aug 27 08:47:45 2009 Log: - Updated packages lib/ffmpeg and mediaplayers/mplayer-svn.
http://code.google.com/p/minimyth/source/detail?r=5367 Modified: /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-mt_20090824.patch /trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-vaapi_20090804.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-mt_20090824.patch /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-vaapi_20090804.patch /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk ======================================= --- /trunk/gar-minimyth/html/minimyth/index.html Tue Aug 25 20:28:13 2009 +++ /trunk/gar-minimyth/html/minimyth/index.html Thu Aug 27 08:47:45 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 29549</strong> and - <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN 19708</strong> + <a href="http://www.mplayerhq.hu/";>MPlayer</a> <strong>SVN 29565</strong> and + <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN 19729</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.1</strong> and - <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN 19708</strong> + <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN 19729</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 19708</strong> + <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN 19729</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-08-25 + Last Updated on 2009-08-27 <br /> < mailto : webmaster at minimyth dot org > </div> ======================================= --- /trunk/gar-minimyth/script/lib/ffmpeg/Makefile Tue Aug 25 20:28:13 2009 +++ /trunk/gar-minimyth/script/lib/ffmpeg/Makefile Thu Aug 27 08:47:45 2009 @@ -1,5 +1,5 @@ GARNAME = ffmpeg -GARVERSION = 19708.$(MPLAYER_TRUNK_VERSION) +GARVERSION = 19729.$(MPLAYER_TRUNK_VERSION) CATEGORIES = lib MASTER_SITES = svn://svn.ffmpeg.org/ DISTFILES = $(DISTNAME).tar.bz2 ======================================= --- /trunk/gar-minimyth/script/lib/ffmpeg/checksums Tue Aug 25 20:28:13 2009 +++ /trunk/gar-minimyth/script/lib/ffmpeg/checksums Thu Aug 27 08:47:45 2009 @@ -1,3 +1,3 @@ -1ee31b8a55aa8be4d5a61ef022897aaf download/ffmpeg-mt_20090824.patch -4ed46156eb0900e142121d66e4b969fd download/ffmpeg-vaapi_20090804.patch -483b7d62df8a56d551c3e4bbfb26fd62 download/ffmpeg.patch.gar +704ddcc43c0934dab6deb11aeb7de0dd download/ffmpeg-mt_20090824.patch +ed8cdc002392287a0f636601eab98c96 download/ffmpeg-vaapi_20090804.patch +0f2ae94eb3b013e30ee6e59161df811c download/ffmpeg.patch.gar ======================================= --- /trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-mt_20090824.patch Tue Aug 25 20:28:13 2009 +++ /trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-mt_20090824.patch Thu Aug 27 08:47:45 2009 @@ -1,6 +1,6 @@ -diff -Naur ffmpeg-19708.29549-old/doc/multithreading.txt ffmpeg-19708.29549-new/doc/multithreading.txt ---- ffmpeg-19708.29549-old/doc/multithreading.txt 1969-12-31 16:00:00.000000000 -0800 -+++ ffmpeg-19708.29549-new/doc/multithreading.txt 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/doc/multithreading.txt ffmpeg-19729.29565-new/doc/multithreading.txt +--- ffmpeg-19729.29565-old/doc/multithreading.txt 1969-12-31 16:00:00.000000000 -0800 ++++ ffmpeg-19729.29565-new/doc/multithreading.txt 2009-08-27 08:43:50.000000000 -0700 @@ -0,0 +1,73 @@ +FFmpeg multithreading methods +============================================== @@ -75,9 +75,9 @@ + +5. Call ff_report_frame_setup_done() as soon as possible. This will start the +next thread. -diff -Naur ffmpeg-19708.29549-old/ffmpeg.c ffmpeg-19708.29549-new/ffmpeg.c ---- ffmpeg-19708.29549-old/ffmpeg.c 2009-08-25 19:14:21.000000000 -0700 -+++ ffmpeg-19708.29549-new/ffmpeg.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/ffmpeg.c ffmpeg-19729.29565-new/ffmpeg.c +--- ffmpeg-19729.29565-old/ffmpeg.c 2009-08-27 08:43:34.000000000 -0700 ++++ ffmpeg-19729.29565-new/ffmpeg.c 2009-08-27 08:43:50.000000000 -0700 @@ -491,11 +491,6 @@ else if (st->codec->codec_type == CODEC_TYPE_VIDEO && video_stream_copy) st->stream_copy = 1; @@ -90,7 +90,7 @@ if(st->codec->flags & CODEC_FLAG_BITEXACT) nopts = 1; } -@@ -2899,8 +2894,6 @@ +@@ -2903,8 +2898,6 @@ /* update the current parameters so that they match the one of the input stream */ for(i=0;i<ic->nb_streams;i++) { AVCodecContext *enc = ic->streams[i]->codec; @@ -99,7 +99,7 @@ enc->thread_count= thread_count; switch(enc->codec_type) { case CODEC_TYPE_AUDIO: -@@ -3033,8 +3026,7 @@ +@@ -3037,8 +3030,7 @@ bitstream_filters[nb_output_files][oc->nb_streams - 1]= video_bitstream_filters; video_bitstream_filters= NULL; @@ -109,7 +109,7 @@ video_enc = st->codec; -@@ -3176,8 +3168,7 @@ +@@ -3180,8 +3172,7 @@ bitstream_filters[nb_output_files][oc->nb_streams - 1]= audio_bitstream_filters; audio_bitstream_filters= NULL; @@ -119,9 +119,9 @@ audio_enc = st->codec; audio_enc->codec_type = CODEC_TYPE_AUDIO; -diff -Naur ffmpeg-19708.29549-old/ffplay.c ffmpeg-19708.29549-new/ffplay.c ---- ffmpeg-19708.29549-old/ffplay.c 2009-08-25 19:14:21.000000000 -0700 -+++ ffmpeg-19708.29549-new/ffplay.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/ffplay.c ffmpeg-19729.29565-new/ffplay.c +--- ffmpeg-19729.29565-old/ffplay.c 2009-08-27 08:43:34.000000000 -0700 ++++ ffmpeg-19729.29565-new/ffplay.c 2009-08-27 08:43:50.000000000 -0700 @@ -1719,6 +1719,7 @@ enc->skip_loop_filter= skip_loop_filter; enc->error_recognition= error_recognition; @@ -140,10 +140,10 @@ ic->streams[stream_index]->discard = AVDISCARD_DEFAULT; switch(enc->codec_type) { case CODEC_TYPE_AUDIO: -diff -Naur ffmpeg-19708.29549-old/libavcodec/avcodec.h ffmpeg-19708.29549-new/libavcodec/avcodec.h ---- ffmpeg-19708.29549-old/libavcodec/avcodec.h 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/avcodec.h 2009-08-25 19:38:53.000000000 -0700 -@@ -602,6 +602,10 @@ +diff -Naur ffmpeg-19729.29565-old/libavcodec/avcodec.h ffmpeg-19729.29565-new/libavcodec/avcodec.h +--- ffmpeg-19729.29565-old/libavcodec/avcodec.h 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/avcodec.h 2009-08-27 08:43:50.000000000 -0700 +@@ -604,6 +604,10 @@ * Codec can export data for HW decoding (VDPAU). */ #define CODEC_CAP_HWACCEL_VDPAU 0x0080 @@ -154,7 +154,7 @@ //The following defines may change, don't expect compatibility if you use them. #define MB_TYPE_INTRA4x4 0x0001 -@@ -881,7 +885,20 @@ +@@ -883,7 +887,20 @@ * - decoding: Set by libavcodec\ */\ void *hwaccel_picture_private;\ @@ -176,7 +176,7 @@ #define FF_QSCALE_TYPE_MPEG1 0 #define FF_QSCALE_TYPE_MPEG2 1 -@@ -1087,7 +1104,7 @@ +@@ -1089,7 +1106,7 @@ * If non NULL, 'draw_horiz_band' is called by the libavcodec * decoder to draw a horizontal band. It improves cache usage. Not * all codecs can do that. You must check the codec capabilities @@ -185,7 +185,7 @@ * The function is also used by hardware acceleration APIs. * It is called at least once during frame decoding to pass * the data needed for hardware render. -@@ -1336,7 +1353,8 @@ +@@ -1338,7 +1355,8 @@ * height, as they normally need to be rounded up to the next multiple of 16. * if CODEC_CAP_DR1 is not set then get_buffer() must call * avcodec_default_get_buffer() instead of providing buffers allocated by @@ -195,7 +195,7 @@ * - encoding: unused * - decoding: Set by libavcodec., user can override. */ -@@ -1345,7 +1363,9 @@ +@@ -1347,7 +1365,9 @@ /** * Called to release buffers which were allocated with get_buffer. * A released buffer can be reused in get_buffer(). @@ -206,7 +206,7 @@ * - encoding: unused * - decoding: Set by libavcodec., user can override. */ -@@ -1646,6 +1666,7 @@ +@@ -1648,6 +1668,7 @@ #define FF_DEBUG_VIS_QP 0x00002000 #define FF_DEBUG_VIS_MB_TYPE 0x00004000 #define FF_DEBUG_BUFFERS 0x00008000 @@ -214,7 +214,7 @@ /** * debug -@@ -2518,7 +2539,33 @@ +@@ -2520,7 +2541,33 @@ * - encoding: Set by user * - decoding: Set by libavcodec */ @@ -249,7 +249,7 @@ } AVCodecContext; /** -@@ -2560,6 +2607,26 @@ +@@ -2562,6 +2609,26 @@ const int *supported_samplerates; ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0 const enum SampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1 const int64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0 @@ -276,9 +276,9 @@ } AVCodec; /** -diff -Naur ffmpeg-19708.29549-old/libavcodec/beosthread.c ffmpeg-19708.29549-new/libavcodec/beosthread.c ---- ffmpeg-19708.29549-old/libavcodec/beosthread.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/beosthread.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/beosthread.c ffmpeg-19729.29565-new/libavcodec/beosthread.c +--- ffmpeg-19729.29565-old/libavcodec/beosthread.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/beosthread.c 2009-08-27 08:43:50.000000000 -0700 @@ -121,7 +121,13 @@ int i; ThreadContext *c; @@ -293,9 +293,9 @@ assert(!s->thread_opaque); c= av_mallocz(sizeof(ThreadContext)*thread_count); -diff -Naur ffmpeg-19708.29549-old/libavcodec/dsputil.c ffmpeg-19708.29549-new/libavcodec/dsputil.c ---- ffmpeg-19708.29549-old/libavcodec/dsputil.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/dsputil.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/dsputil.c ffmpeg-19729.29565-new/libavcodec/dsputil.c +--- ffmpeg-19729.29565-old/libavcodec/dsputil.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/dsputil.c 2009-08-27 08:43:50.000000000 -0700 @@ -438,7 +438,7 @@ /* draw the edges of width 'w' of an image of size width, height */ @@ -336,10 +336,10 @@ } } -diff -Naur ffmpeg-19708.29549-old/libavcodec/dsputil.h ffmpeg-19708.29549-new/libavcodec/dsputil.h ---- ffmpeg-19708.29549-old/libavcodec/dsputil.h 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/dsputil.h 2009-08-25 19:38:53.000000000 -0700 -@@ -448,8 +448,10 @@ +diff -Naur ffmpeg-19729.29565-old/libavcodec/dsputil.h ffmpeg-19729.29565-new/libavcodec/dsputil.h +--- ffmpeg-19729.29565-old/libavcodec/dsputil.h 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/dsputil.h 2009-08-27 08:43:50.000000000 -0700 +@@ -449,8 +449,10 @@ #define BASIS_SHIFT 16 #define RECON_SHIFT 6 @@ -351,9 +351,9 @@ /* h264 functions */ /* NOTE!!! if you implement any of h264_idct8_add, h264_idct8_add4 then you must implement all of them -diff -Naur ffmpeg-19708.29549-old/libavcodec/h263.c ffmpeg-19708.29549-new/libavcodec/h263.c ---- ffmpeg-19708.29549-old/libavcodec/h263.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/h263.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/h263.c ffmpeg-19729.29565-new/libavcodec/h263.c +--- ffmpeg-19729.29565-old/libavcodec/h263.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/h263.c 2009-08-27 08:43:50.000000000 -0700 @@ -41,6 +41,7 @@ #include "mpeg4data.h" #include "mathops.h" @@ -400,9 +400,9 @@ if(s->pict_type==FF_B_TYPE && s->next_picture.mbskip_table[xy + delta]) return SLICE_OK; return SLICE_END; -diff -Naur ffmpeg-19708.29549-old/libavcodec/h263dec.c ffmpeg-19708.29549-new/libavcodec/h263dec.c ---- ffmpeg-19708.29549-old/libavcodec/h263dec.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/h263dec.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/h263dec.c ffmpeg-19729.29565-new/libavcodec/h263dec.c +--- ffmpeg-19729.29565-old/libavcodec/h263dec.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/h263dec.c 2009-08-27 08:43:50.000000000 -0700 @@ -32,6 +32,7 @@ #include "h263_parser.h" #include "mpeg4video_parser.h" @@ -443,9 +443,9 @@ }; AVCodec h263_decoder = { -diff -Naur ffmpeg-19708.29549-old/libavcodec/h264.c ffmpeg-19708.29549-new/libavcodec/h264.c ---- ffmpeg-19708.29549-old/libavcodec/h264.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/h264.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/h264.c ffmpeg-19729.29565-new/libavcodec/h264.c +--- ffmpeg-19729.29565-old/libavcodec/h264.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/h264.c 2009-08-27 08:43:50.000000000 -0700 @@ -35,6 +35,7 @@ #include "golomb.h" #include "mathops.h" @@ -1383,9 +1383,9 @@ }; #if CONFIG_H264_VDPAU_DECODER -diff -Naur ffmpeg-19708.29549-old/libavcodec/h264.h ffmpeg-19708.29549-new/libavcodec/h264.h ---- ffmpeg-19708.29549-old/libavcodec/h264.h 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/h264.h 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/h264.h ffmpeg-19729.29565-new/libavcodec/h264.h +--- ffmpeg-19729.29565-old/libavcodec/h264.h 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/h264.h 2009-08-27 08:43:50.000000000 -0700 @@ -250,7 +250,7 @@ * Used to parse AVC variant of h264 */ @@ -1403,9 +1403,9 @@ int outputed_poc; /** -diff -Naur ffmpeg-19708.29549-old/libavcodec/huffyuv.c ffmpeg-19708.29549-new/libavcodec/huffyuv.c ---- ffmpeg-19708.29549-old/libavcodec/huffyuv.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/huffyuv.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/huffyuv.c ffmpeg-19729.29565-new/libavcodec/huffyuv.c +--- ffmpeg-19729.29565-old/libavcodec/huffyuv.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/huffyuv.c 2009-08-27 08:43:50.000000000 -0700 @@ -32,6 +32,7 @@ #include "get_bits.h" #include "put_bits.h" @@ -1478,9 +1478,9 @@ .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), }; #endif -diff -Naur ffmpeg-19708.29549-old/libavcodec/mdec.c ffmpeg-19708.29549-new/libavcodec/mdec.c ---- ffmpeg-19708.29549-old/libavcodec/mdec.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/mdec.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/mdec.c ffmpeg-19729.29565-new/libavcodec/mdec.c +--- ffmpeg-19729.29565-old/libavcodec/mdec.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/mdec.c 2009-08-27 08:43:50.000000000 -0700 @@ -31,6 +31,7 @@ #include "dsputil.h" #include "mpegvideo.h" @@ -1531,9 +1531,9 @@ + .init_copy= ONLY_IF_THREADS_ENABLED(decode_init_copy) }; -diff -Naur ffmpeg-19708.29549-old/libavcodec/mimic.c ffmpeg-19708.29549-new/libavcodec/mimic.c ---- ffmpeg-19708.29549-old/libavcodec/mimic.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/mimic.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/mimic.c ffmpeg-19729.29565-new/libavcodec/mimic.c +--- ffmpeg-19729.29565-old/libavcodec/mimic.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/mimic.c 2009-08-27 08:43:50.000000000 -0700 @@ -27,6 +27,7 @@ #include "get_bits.h" #include "bytestream.h" @@ -1685,9 +1685,9 @@ .long_name = NULL_IF_CONFIG_SMALL("Mimic"), + .update_context = ONLY_IF_THREADS_ENABLED(mimic_decode_update_context) }; -diff -Naur ffmpeg-19708.29549-old/libavcodec/mpeg12.c ffmpeg-19708.29549-new/libavcodec/mpeg12.c ---- ffmpeg-19708.29549-old/libavcodec/mpeg12.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/mpeg12.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/mpeg12.c ffmpeg-19729.29565-new/libavcodec/mpeg12.c +--- ffmpeg-19729.29565-old/libavcodec/mpeg12.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/mpeg12.c 2009-08-27 08:43:50.000000000 -0700 @@ -37,6 +37,7 @@ #include "bytestream.h" #include "vdpau_internal.h" @@ -1800,9 +1800,9 @@ return -1; if( !(avctx->slice_flags & SLICE_FLAG_CODED_ORDER) ) return -1; -diff -Naur ffmpeg-19708.29549-old/libavcodec/mpegvideo.c ffmpeg-19708.29549-new/libavcodec/mpegvideo.c ---- ffmpeg-19708.29549-old/libavcodec/mpegvideo.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/mpegvideo.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/mpegvideo.c ffmpeg-19729.29565-new/libavcodec/mpegvideo.c +--- ffmpeg-19729.29565-old/libavcodec/mpegvideo.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/mpegvideo.c 2009-08-27 08:43:50.000000000 -0700 @@ -35,6 +35,7 @@ #include "msmpeg4.h" #include "faandct.h" @@ -2231,9 +2231,9 @@ + if (s->pict_type != FF_B_TYPE && !s->partitioned_frame) + ff_report_frame_progress((AVFrame*)s->current_picture_ptr, s->mb_y); +} -diff -Naur ffmpeg-19708.29549-old/libavcodec/mpegvideo_enc.c ffmpeg-19708.29549-new/libavcodec/mpegvideo_enc.c ---- ffmpeg-19708.29549-old/libavcodec/mpegvideo_enc.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/mpegvideo_enc.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/mpegvideo_enc.c ffmpeg-19729.29565-new/libavcodec/mpegvideo_enc.c +--- ffmpeg-19729.29565-old/libavcodec/mpegvideo_enc.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/mpegvideo_enc.c 2009-08-27 08:43:50.000000000 -0700 @@ -35,6 +35,7 @@ #include "msmpeg4.h" #include "h263.h" @@ -2322,9 +2322,9 @@ merge_context_after_encode(s, s->thread_context[i]); } emms_c(); -diff -Naur ffmpeg-19708.29549-old/libavcodec/mpegvideo.h ffmpeg-19708.29549-new/libavcodec/mpegvideo.h ---- ffmpeg-19708.29549-old/libavcodec/mpegvideo.h 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/mpegvideo.h 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/mpegvideo.h ffmpeg-19729.29565-new/libavcodec/mpegvideo.h +--- ffmpeg-19729.29565-old/libavcodec/mpegvideo.h 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/mpegvideo.h 2009-08-27 08:43:50.000000000 -0700 @@ -123,6 +123,7 @@ int ref_poc[2][2][16]; ///< h264 POCs of the frames used as reference (FIXME need per slice) int ref_count[2][2]; ///< number of entries in ref_poc (FIXME need per slice) @@ -2361,9 +2361,9 @@ const uint8_t *ff_find_start_code(const uint8_t *p, const uint8_t *end, uint32_t *state); void ff_er_frame_start(MpegEncContext *s); -diff -Naur ffmpeg-19708.29549-old/libavcodec/options.c ffmpeg-19708.29549-new/libavcodec/options.c ---- ffmpeg-19708.29549-old/libavcodec/options.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/options.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/options.c ffmpeg-19729.29565-new/libavcodec/options.c +--- ffmpeg-19729.29565-old/libavcodec/options.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/options.c 2009-08-27 08:43:50.000000000 -0700 @@ -245,6 +245,7 @@ {"vis_qp", "visualize quantization parameter (QP), lower QP are tinted greener", 0, FF_OPT_TYPE_CONST, FF_DEBUG_VIS_QP, INT_MIN, INT_MAX, V| D, "debug"}, {"vis_mb_type", "visualize block types", 0, FF_OPT_TYPE_CONST, FF_DEBUG_VIS_MB_TYPE, INT_MIN, INT_MAX, V|D, "debug"}, @@ -2382,9 +2382,9 @@ {NULL}, }; -diff -Naur ffmpeg-19708.29549-old/libavcodec/os2thread.c ffmpeg-19708.29549-new/libavcodec/os2thread.c ---- ffmpeg-19708.29549-old/libavcodec/os2thread.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/os2thread.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/os2thread.c ffmpeg-19729.29565-new/libavcodec/os2thread.c +--- ffmpeg-19729.29565-old/libavcodec/os2thread.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/os2thread.c 2009-08-27 08:43:50.000000000 -0700 @@ -114,7 +114,13 @@ ThreadContext *c; uint32_t threadid; @@ -2399,9 +2399,9 @@ assert(!s->thread_opaque); c= av_mallocz(sizeof(ThreadContext)*thread_count); -diff -Naur ffmpeg-19708.29549-old/libavcodec/pthread.c ffmpeg-19708.29549-new/libavcodec/pthread.c ---- ffmpeg-19708.29549-old/libavcodec/pthread.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/pthread.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/pthread.c ffmpeg-19729.29565-new/libavcodec/pthread.c +--- ffmpeg-19729.29565-old/libavcodec/pthread.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/pthread.c 2009-08-27 08:43:50.000000000 -0700 @@ -1,5 +1,6 @@ /* * Copyright (c) 2004 Roman Shaposhnik @@ -3036,9 +3036,9 @@ + else + thread_free(avctx); +} -diff -Naur ffmpeg-19708.29549-old/libavcodec/snow.c ffmpeg-19708.29549-new/libavcodec/snow.c ---- ffmpeg-19708.29549-old/libavcodec/snow.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/snow.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/snow.c ffmpeg-19729.29565-new/libavcodec/snow.c +--- ffmpeg-19729.29565-old/libavcodec/snow.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/snow.c 2009-08-27 08:43:50.000000000 -0700 @@ -4132,9 +4132,9 @@ int h= s->avctx->height; @@ -3052,9 +3052,9 @@ } release_buffer(s->avctx); -diff -Naur ffmpeg-19708.29549-old/libavcodec/thread.h ffmpeg-19708.29549-new/libavcodec/thread.h ---- ffmpeg-19708.29549-old/libavcodec/thread.h 1969-12-31 16:00:00.000000000 -0800 -+++ ffmpeg-19708.29549-new/libavcodec/thread.h 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/thread.h ffmpeg-19729.29565-new/libavcodec/thread.h +--- ffmpeg-19729.29565-old/libavcodec/thread.h 1969-12-31 16:00:00.000000000 -0800 ++++ ffmpeg-19729.29565-new/libavcodec/thread.h 2009-08-27 08:43:50.000000000 -0700 @@ -0,0 +1,139 @@ +/* + * Multithreading support @@ -3195,9 +3195,9 @@ +#endif + +#endif /* AVCODEC_THREAD_H */ -diff -Naur ffmpeg-19708.29549-old/libavcodec/utils.c ffmpeg-19708.29549-new/libavcodec/utils.c ---- ffmpeg-19708.29549-old/libavcodec/utils.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/utils.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/utils.c ffmpeg-19729.29565-new/libavcodec/utils.c +--- ffmpeg-19729.29565-old/libavcodec/utils.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/utils.c 2009-08-27 08:43:50.000000000 -0700 @@ -35,6 +35,7 @@ #include "dsputil.h" #include "opt.h" @@ -3294,9 +3294,9 @@ if(avctx->codec->flush) avctx->codec->flush(avctx); } -diff -Naur ffmpeg-19708.29549-old/libavcodec/vp3.c ffmpeg-19708.29549-new/libavcodec/vp3.c ---- ffmpeg-19708.29549-old/libavcodec/vp3.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/vp3.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/vp3.c ffmpeg-19729.29565-new/libavcodec/vp3.c +--- ffmpeg-19729.29565-old/libavcodec/vp3.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/vp3.c 2009-08-27 08:43:50.000000000 -0700 @@ -39,6 +39,7 @@ #include "vp3data.h" @@ -3718,9 +3718,9 @@ .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"), + .update_context = ONLY_IF_THREADS_ENABLED(vp3_update_context), }; -diff -Naur ffmpeg-19708.29549-old/libavcodec/w32thread.c ffmpeg-19708.29549-new/libavcodec/w32thread.c ---- ffmpeg-19708.29549-old/libavcodec/w32thread.c 2009-08-25 19:14:16.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/w32thread.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/w32thread.c ffmpeg-19729.29565-new/libavcodec/w32thread.c +--- ffmpeg-19729.29565-old/libavcodec/w32thread.c 2009-08-27 08:43:32.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/w32thread.c 2009-08-27 08:43:50.000000000 -0700 @@ -105,7 +105,13 @@ ThreadContext *c; uint32_t threadid; @@ -3735,9 +3735,9 @@ assert(!s->thread_opaque); c= av_mallocz(sizeof(ThreadContext)*thread_count); -diff -Naur ffmpeg-19708.29549-old/libavcodec/x86/dsputil_mmx.c ffmpeg-19708.29549-new/libavcodec/x86/dsputil_mmx.c ---- ffmpeg-19708.29549-old/libavcodec/x86/dsputil_mmx.c 2009-08-25 19:14:10.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/x86/dsputil_mmx.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/x86/dsputil_mmx.c ffmpeg-19729.29565-new/libavcodec/x86/dsputil_mmx.c +--- ffmpeg-19729.29565-old/libavcodec/x86/dsputil_mmx.c 2009-08-27 08:43:30.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/x86/dsputil_mmx.c 2009-08-27 08:43:50.000000000 -0700 @@ -807,7 +807,7 @@ /* draw the edges of width 'w' of an image of size width, height @@ -3815,9 +3815,9 @@ } } -diff -Naur ffmpeg-19708.29549-old/libavutil/internal.h ffmpeg-19708.29549-new/libavutil/internal.h ---- ffmpeg-19708.29549-old/libavutil/internal.h 2009-08-25 19:14:04.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavutil/internal.h 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavutil/internal.h ffmpeg-19729.29565-new/libavutil/internal.h +--- ffmpeg-19729.29565-old/libavutil/internal.h 2009-08-27 08:43:27.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavutil/internal.h 2009-08-27 08:43:50.000000000 -0700 @@ -318,4 +318,10 @@ # define NULL_IF_CONFIG_SMALL(x) x #endif @@ -3829,9 +3829,9 @@ +#endif + #endif /* AVUTIL_INTERNAL_H */ -diff -Naur ffmpeg-19708.29549-old/libavutil/log.c ffmpeg-19708.29549-new/libavutil/log.c ---- ffmpeg-19708.29549-old/libavutil/log.c 2009-08-25 19:14:04.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavutil/log.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavutil/log.c ffmpeg-19729.29565-new/libavutil/log.c +--- ffmpeg-19729.29565-old/libavutil/log.c 2009-08-27 08:43:27.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavutil/log.c 2009-08-27 08:43:50.000000000 -0700 @@ -35,6 +35,8 @@ static int count; static char line[1024], prev[1024]; ======================================= --- /trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-vaapi_20090804.patch Tue Aug 25 20:28:13 2009 +++ /trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-vaapi_20090804.patch Thu Aug 27 08:47:45 2009 @@ -1,6 +1,6 @@ -diff -Naur ffmpeg-19708.29549-old/libavcodec/allcodecs.c ffmpeg-19708.29549-new/libavcodec/allcodecs.c ---- ffmpeg-19708.29549-old/libavcodec/allcodecs.c 2009-08-25 19:38:53.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/allcodecs.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/allcodecs.c ffmpeg-19729.29565-new/libavcodec/allcodecs.c +--- ffmpeg-19729.29565-old/libavcodec/allcodecs.c 2009-08-27 08:43:50.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/allcodecs.c 2009-08-27 08:43:50.000000000 -0700 @@ -55,6 +55,7 @@ /* hardware accelerators */ @@ -9,9 +9,9 @@ REGISTER_HWACCEL (MPEG2_VAAPI, mpeg2_vaapi); REGISTER_HWACCEL (MPEG4_VAAPI, mpeg4_vaapi); REGISTER_HWACCEL (VC1_VAAPI, vc1_vaapi); -diff -Naur ffmpeg-19708.29549-old/libavcodec/Makefile ffmpeg-19708.29549-new/libavcodec/Makefile ---- ffmpeg-19708.29549-old/libavcodec/Makefile 2009-08-25 19:38:53.000000000 -0700 -+++ ffmpeg-19708.29549-new/libavcodec/Makefile 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/Makefile ffmpeg-19729.29565-new/libavcodec/Makefile +--- ffmpeg-19729.29565-old/libavcodec/Makefile 2009-08-27 08:43:50.000000000 -0700 ++++ ffmpeg-19729.29565-new/libavcodec/Makefile 2009-08-27 08:43:50.000000000 -0700 @@ -3,7 +3,7 @@ NAME = avcodec FFLIBS = avutil @@ -29,9 +29,9 @@ OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o -diff -Naur ffmpeg-19708.29549-old/libavcodec/vaapi_h264.c ffmpeg-19708.29549-new/libavcodec/vaapi_h264.c ---- ffmpeg-19708.29549-old/libavcodec/vaapi_h264.c 1969-12-31 16:00:00.000000000 -0800 -+++ ffmpeg-19708.29549-new/libavcodec/vaapi_h264.c 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/libavcodec/vaapi_h264.c ffmpeg-19729.29565-new/libavcodec/vaapi_h264.c +--- ffmpeg-19729.29565-old/libavcodec/vaapi_h264.c 1969-12-31 16:00:00.000000000 -0800 ++++ ffmpeg-19729.29565-new/libavcodec/vaapi_h264.c 2009-08-27 08:43:50.000000000 -0700 @@ -0,0 +1,353 @@ +/* + * H.264 HW decode acceleration through VA API ======================================= --- /trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg.patch.gar Tue Aug 25 20:28:13 2009 +++ /trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg.patch.gar Thu Aug 27 08:47:45 2009 @@ -1,6 +1,6 @@ -diff -Naur ffmpeg-19708.29549-old/configure ffmpeg-19708.29549-new/configure ---- ffmpeg-19708.29549-old/configure 2009-08-25 19:38:53.000000000 -0700 -+++ ffmpeg-19708.29549-new/configure 2009-08-25 19:38:53.000000000 -0700 +diff -Naur ffmpeg-19729.29565-old/configure ffmpeg-19729.29565-new/configure +--- ffmpeg-19729.29565-old/configure 2009-08-27 08:43:50.000000000 -0700 ++++ ffmpeg-19729.29565-new/configure 2009-08-27 08:43:51.000000000 -0700 @@ -766,11 +766,11 @@ func=$4 shift 4 ======================================= --- /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums Tue Aug 25 20:28:13 2009 +++ /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums Thu Aug 27 08:47:45 2009 @@ -1,3 +1,3 @@ -356f775366a1649c0d7813a94758f8d2 download/MPlayer-mt_20090824.patch -0e803de4551f609ca4e8e9eba2089085 download/MPlayer-gcc_4.4.0_hack.patch -3ac28674d4312108e957792047261a6d download/MPlayer-vaapi_20090804.patch +fff88b12808acf9ca6a1641eb5c43ad5 download/MPlayer-mt_20090824.patch +01e3e4e69851f14b78572f80aa9c0a84 download/MPlayer-gcc_4.4.0_hack.patch +753d670be322a96ee9bab05481010578 download/MPlayer-vaapi_20090804.patch ======================================= --- /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-gcc_4.4.0_hack.patch Tue Aug 25 20:28:13 2009 +++ /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-gcc_4.4.0_hack.patch Thu Aug 27 08:47:45 2009 @@ -1,6 +1,6 @@ -diff -Naur MPlayer-29549-old/configure MPlayer-29549-new/configure ---- MPlayer-29549-old/configure 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/configure 2009-08-25 19:45:57.000000000 -0700 +diff -Naur MPlayer-29565-old/configure MPlayer-29565-new/configure +--- MPlayer-29565-old/configure 2009-08-27 08:45:42.000000000 -0700 ++++ MPlayer-29565-new/configure 2009-08-27 08:45:43.000000000 -0700 @@ -2412,8 +2412,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; } ======================================= --- /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-mt_20090824.patch Tue Aug 25 20:28:13 2009 +++ /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-mt_20090824.patch Thu Aug 27 08:47:45 2009 @@ -1,6 +1,6 @@ -diff -Naur MPlayer-29549-old/libmpcodecs/vd_ffmpeg.c MPlayer-29549-new/libmpcodecs/vd_ffmpeg.c ---- MPlayer-29549-old/libmpcodecs/vd_ffmpeg.c 2009-08-25 19:42:00.000000000 -0700 -+++ MPlayer-29549-new/libmpcodecs/vd_ffmpeg.c 2009-08-25 19:45:57.000000000 -0700 +diff -Naur MPlayer-29565-old/libmpcodecs/vd_ffmpeg.c MPlayer-29565-new/libmpcodecs/vd_ffmpeg.c +--- MPlayer-29565-old/libmpcodecs/vd_ffmpeg.c 2009-08-27 08:44:42.000000000 -0700 ++++ MPlayer-29565-new/libmpcodecs/vd_ffmpeg.c 2009-08-27 08:45:42.000000000 -0700 @@ -145,7 +145,12 @@ avcodec_flush_buffers(avctx); return CONTROL_TRUE; @@ -15,9 +15,9 @@ } return CONTROL_UNKNOWN; } -diff -Naur MPlayer-29549-old/libvo/vo_corevideo.m MPlayer-29549-new/libvo/vo_corevideo.m ---- MPlayer-29549-old/libvo/vo_corevideo.m 2009-08-25 19:42:09.000000000 -0700 -+++ MPlayer-29549-new/libvo/vo_corevideo.m 2009-08-25 19:45:57.000000000 -0700 +diff -Naur MPlayer-29565-old/libvo/vo_corevideo.m MPlayer-29565-new/libvo/vo_corevideo.m +--- MPlayer-29565-old/libvo/vo_corevideo.m 2009-08-27 08:44:47.000000000 -0700 ++++ MPlayer-29565-new/libvo/vo_corevideo.m 2009-08-27 08:45:42.000000000 -0700 @@ -466,6 +466,8 @@ NSRect frame; CVReturn error = kCVReturnSuccess; ======================================= --- /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-vaapi_20090804.patch Tue Aug 25 20:28:13 2009 +++ /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-vaapi_20090804.patch Thu Aug 27 08:47:45 2009 @@ -1,6 +1,6 @@ -diff -Naur MPlayer-29549-old/cfg-common-opts.h MPlayer-29549-new/cfg-common-opts.h ---- MPlayer-29549-old/cfg-common-opts.h 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/cfg-common-opts.h 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/cfg-common-opts.h MPlayer-29565-new/cfg-common-opts.h +--- MPlayer-29565-old/cfg-common-opts.h 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/cfg-common-opts.h 2009-08-27 08:45:43.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-29549-old/codec-cfg.c MPlayer-29549-new/codec-cfg.c ---- MPlayer-29549-old/codec-cfg.c 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/codec-cfg.c 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/codec-cfg.c MPlayer-29565-new/codec-cfg.c +--- MPlayer-29565-old/codec-cfg.c 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/codec-cfg.c 2009-08-27 08:45:43.000000000 -0700 @@ -187,6 +187,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-29549-old/configure MPlayer-29549-new/configure ---- MPlayer-29549-old/configure 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/configure 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/configure MPlayer-29565-new/configure +--- MPlayer-29565-old/configure 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/configure 2009-08-27 08:45:43.000000000 -0700 @@ -354,6 +354,9 @@ --disable-muxer=MUXER disable specified FFmpeg muxer --enable-muxer=MUXER enable specified FFmpeg muxer @@ -167,9 +167,9 @@ #endif /* MPLAYER_CONFIG_H */ EOF -diff -Naur MPlayer-29549-old/etc/codecs.conf MPlayer-29549-new/etc/codecs.conf ---- MPlayer-29549-old/etc/codecs.conf 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/etc/codecs.conf 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/etc/codecs.conf MPlayer-29565-new/etc/codecs.conf +--- MPlayer-29565-old/etc/codecs.conf 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/etc/codecs.conf 2009-08-27 08:45:43.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-29549-old/fmt-conversion.c MPlayer-29549-new/fmt-conversion.c ---- MPlayer-29549-old/fmt-conversion.c 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/fmt-conversion.c 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/fmt-conversion.c MPlayer-29565-new/fmt-conversion.c +--- MPlayer-29565-old/fmt-conversion.c 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/fmt-conversion.c 2009-08-27 08:45:43.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-29549-old/fmt-conversion.h MPlayer-29549-new/fmt-conversion.h ---- MPlayer-29549-old/fmt-conversion.h 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/fmt-conversion.h 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/fmt-conversion.h MPlayer-29565-new/fmt-conversion.h +--- MPlayer-29565-old/fmt-conversion.h 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/fmt-conversion.h 2009-08-27 08:45:43.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-29549-old/gui/mplayer/gtk/opts.c MPlayer-29549-new/gui/mplayer/gtk/opts.c ---- MPlayer-29549-old/gui/mplayer/gtk/opts.c 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/gui/mplayer/gtk/opts.c 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/gui/mplayer/gtk/opts.c MPlayer-29565-new/gui/mplayer/gtk/opts.c +--- MPlayer-29565-old/gui/mplayer/gtk/opts.c 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/gui/mplayer/gtk/opts.c 2009-08-27 08:45:43.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-29549-old/help/help_mp-en.h MPlayer-29549-new/help/help_mp-en.h ---- MPlayer-29549-old/help/help_mp-en.h 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/help/help_mp-en.h 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/help/help_mp-en.h MPlayer-29565-new/help/help_mp-en.h +--- MPlayer-29565-old/help/help_mp-en.h 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/help/help_mp-en.h 2009-08-27 08:45:43.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-29549-old/libmpcodecs/dec_video.c MPlayer-29549-new/libmpcodecs/dec_video.c ---- MPlayer-29549-old/libmpcodecs/dec_video.c 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/libmpcodecs/dec_video.c 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/libmpcodecs/dec_video.c MPlayer-29565-new/libmpcodecs/dec_video.c +--- MPlayer-29565-old/libmpcodecs/dec_video.c 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/libmpcodecs/dec_video.c 2009-08-27 08:45:43.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-29549-old/libmpcodecs/dec_video.h MPlayer-29549-new/libmpcodecs/dec_video.h ---- MPlayer-29549-old/libmpcodecs/dec_video.h 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/libmpcodecs/dec_video.h 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/libmpcodecs/dec_video.h MPlayer-29565-new/libmpcodecs/dec_video.h +--- MPlayer-29565-old/libmpcodecs/dec_video.h 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/libmpcodecs/dec_video.h 2009-08-27 08:45:43.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-29549-old/libmpcodecs/img_format.c MPlayer-29549-new/libmpcodecs/img_format.c ---- MPlayer-29549-old/libmpcodecs/img_format.c 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/libmpcodecs/img_format.c 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/libmpcodecs/img_format.c MPlayer-29565-new/libmpcodecs/img_format.c +--- MPlayer-29565-old/libmpcodecs/img_format.c 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/libmpcodecs/img_format.c 2009-08-27 08:45:43.000000000 -0700 @@ -69,6 +69,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-29549-old/libmpcodecs/img_format.h MPlayer-29549-new/libmpcodecs/img_format.h ---- MPlayer-29549-old/libmpcodecs/img_format.h 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/libmpcodecs/img_format.h 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/libmpcodecs/img_format.h MPlayer-29565-new/libmpcodecs/img_format.h +--- MPlayer-29565-old/libmpcodecs/img_format.h 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/libmpcodecs/img_format.h 2009-08-27 08:45:43.000000000 -0700 @@ -109,6 +109,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-29549-old/libmpcodecs/mp_image.h MPlayer-29549-new/libmpcodecs/mp_image.h ---- MPlayer-29549-old/libmpcodecs/mp_image.h 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/libmpcodecs/mp_image.h 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/libmpcodecs/mp_image.h MPlayer-29565-new/libmpcodecs/mp_image.h +--- MPlayer-29565-old/libmpcodecs/mp_image.h 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/libmpcodecs/mp_image.h 2009-08-27 08:45:43.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-29549-old/libmpcodecs/vd.c MPlayer-29549-new/libmpcodecs/vd.c ---- MPlayer-29549-old/libmpcodecs/vd.c 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/libmpcodecs/vd.c 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/libmpcodecs/vd.c MPlayer-29565-new/libmpcodecs/vd.c +--- MPlayer-29565-old/libmpcodecs/vd.c 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/libmpcodecs/vd.c 2009-08-27 08:45:43.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-29549-old/libmpcodecs/vd_ffmpeg.c MPlayer-29549-new/libmpcodecs/vd_ffmpeg.c ---- MPlayer-29549-old/libmpcodecs/vd_ffmpeg.c 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/libmpcodecs/vd_ffmpeg.c 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/libmpcodecs/vd_ffmpeg.c MPlayer-29565-new/libmpcodecs/vd_ffmpeg.c +--- MPlayer-29565-old/libmpcodecs/vd_ffmpeg.c 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/libmpcodecs/vd_ffmpeg.c 2009-08-27 08:45:43.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-29549-old/libmpcodecs/vd.h MPlayer-29549-new/libmpcodecs/vd.h ---- MPlayer-29549-old/libmpcodecs/vd.h 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/libmpcodecs/vd.h 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/libmpcodecs/vd.h MPlayer-29565-new/libmpcodecs/vd.h +--- MPlayer-29565-old/libmpcodecs/vd.h 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/libmpcodecs/vd.h 2009-08-27 08:45:43.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-29549-old/libmpcodecs/vf.h MPlayer-29549-new/libmpcodecs/vf.h ---- MPlayer-29549-old/libmpcodecs/vf.h 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/libmpcodecs/vf.h 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/libmpcodecs/vf.h MPlayer-29565-new/libmpcodecs/vf.h +--- MPlayer-29565-old/libmpcodecs/vf.h 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/libmpcodecs/vf.h 2009-08-27 08:45:43.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-29549-old/libmpcodecs/vf_vo.c MPlayer-29549-new/libmpcodecs/vf_vo.c ---- MPlayer-29549-old/libmpcodecs/vf_vo.c 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/libmpcodecs/vf_vo.c 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/libmpcodecs/vf_vo.c MPlayer-29565-new/libmpcodecs/vf_vo.c +--- MPlayer-29565-old/libmpcodecs/vf_vo.c 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/libmpcodecs/vf_vo.c 2009-08-27 08:45:43.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-29549-old/libvo/video_out.c MPlayer-29549-new/libvo/video_out.c ---- MPlayer-29549-old/libvo/video_out.c 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/libvo/video_out.c 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/libvo/video_out.c MPlayer-29565-new/libvo/video_out.c +--- MPlayer-29565-old/libvo/video_out.c 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/libvo/video_out.c 2009-08-27 08:45:43.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-29549-old/libvo/video_out.h MPlayer-29549-new/libvo/video_out.h ---- MPlayer-29549-old/libvo/video_out.h 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/libvo/video_out.h 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/libvo/video_out.h MPlayer-29565-new/libvo/video_out.h +--- MPlayer-29565-old/libvo/video_out.h 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/libvo/video_out.h 2009-08-27 08:45:43.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-29549-old/libvo/vo_vaapi.c MPlayer-29549-new/libvo/vo_vaapi.c ---- MPlayer-29549-old/libvo/vo_vaapi.c 1969-12-31 16:00:00.000000000 -0800 -+++ MPlayer-29549-new/libvo/vo_vaapi.c 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/libvo/vo_vaapi.c MPlayer-29565-new/libvo/vo_vaapi.c +--- MPlayer-29565-old/libvo/vo_vaapi.c 1969-12-31 16:00:00.000000000 -0800 ++++ MPlayer-29565-new/libvo/vo_vaapi.c 2009-08-27 08:45:43.000000000 -0700 @@ -0,0 +1,713 @@ +/* + * VA API output module @@ -1518,9 +1518,9 @@ + } + return VO_NOTIMPL; +} -diff -Naur MPlayer-29549-old/Makefile MPlayer-29549-new/Makefile ---- MPlayer-29549-old/Makefile 2009-08-25 19:45:57.000000000 -0700 -+++ MPlayer-29549-new/Makefile 2009-08-25 19:45:58.000000000 -0700 +diff -Naur MPlayer-29565-old/Makefile MPlayer-29565-new/Makefile +--- MPlayer-29565-old/Makefile 2009-08-27 08:45:43.000000000 -0700 ++++ MPlayer-29565-new/Makefile 2009-08-27 08:45:43.000000000 -0700 @@ -621,6 +621,7 @@ SRCS_MPLAYER-$(TGA) += libvo/vo_tga.c SRCS_MPLAYER-$(V4L2) += libvo/vo_v4l2.c ======================================= --- /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk Tue Aug 25 20:28:13 2009 +++ /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk Thu Aug 27 08:47:45 2009 @@ -1,1 +1,1 @@ -MPLAYER_TRUNK_VERSION=29549 +MPLAYER_TRUNK_VERSION=29565 --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
