Revision: 5741 Author: pebender Date: Sat Oct 24 07:54:29 2009 Log: - Updated packages lib/ffmpeg and mediaplayers/mplayer-svn.
http://code.google.com/p/minimyth/source/detail?r=5741 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_20091006.patch /trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-vaapi_20091015.patch /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_20091006.patch /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-vaapi_20091015.patch /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk ======================================= --- /trunk/gar-minimyth/html/minimyth/index.html Fri Oct 23 07:54:32 2009 +++ /trunk/gar-minimyth/html/minimyth/index.html Sat Oct 24 07:54:29 2009 @@ -57,8 +57,8 @@ </li> <li><a href="http://home.kabelfoon.nl/~moongies/streamtuned.html";>MythStream</a> <strong>mythtv-r21640</strong></li> <li> - <a href="http://www.mplayerhq.hu/";>MPlayer</a> <strong>SVN 29779</strong> and - <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN 20304</strong> + <a href="http://www.mplayerhq.hu/";>MPlayer</a> <strong>SVN 29796</strong> and + <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN 20361</strong> </li> <li> <a href="http://www.mplayerhq.hu/";>MPlayer</a> <strong>1.0rc2</strong> with patches to add @@ -69,12 +69,12 @@ </li> <li> <a href="http://www.videolan.org/";>VLC</a> <strong>1.0.2</strong> and - <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN 20304</strong> + <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN 20361</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 20304</strong> + <a href="http://www.ffmpeg.org/";>FFmpeg</a> <strong>SVN 20361</strong> </li> <li> <a href="http://www.hulu.com/";>Hulu Hesktop</a> support (MiniMyth does not include the Hulu Desktop binary) @@ -235,7 +235,7 @@ alt="Valid CSS!" height="31" width="88" /></a> </div> <div class="version"> - Last Updated on 2009-10-23 + Last Updated on 2009-10-24 <br /> < mailto : webmaster at minimyth dot org > </div> ======================================= --- /trunk/gar-minimyth/script/lib/ffmpeg/Makefile Sun Oct 18 18:19:09 2009 +++ /trunk/gar-minimyth/script/lib/ffmpeg/Makefile Sat Oct 24 07:54:29 2009 @@ -1,5 +1,5 @@ GARNAME = ffmpeg -GARVERSION = 20304.$(MPLAYER_TRUNK_VERSION) +GARVERSION = 20361.$(MPLAYER_TRUNK_VERSION) CATEGORIES = lib MASTER_SITES = svn://svn.ffmpeg.org/ DISTFILES = $(DISTNAME).tar.bz2 ======================================= --- /trunk/gar-minimyth/script/lib/ffmpeg/checksums Sun Oct 18 18:19:09 2009 +++ /trunk/gar-minimyth/script/lib/ffmpeg/checksums Sat Oct 24 07:54:29 2009 @@ -1,2 +1,2 @@ -0609e06408d2857a785244eb098341f7 download/ffmpeg-mt_20091006.patch -32906231ebc1070ceac4b587ede0ce43 download/ffmpeg-vaapi_20091015.patch +a6019ed1c4011fc4287fd5a6e12349e6 download/ffmpeg-mt_20091006.patch +3a66b1ba787c6045df3ece8398a33523 download/ffmpeg-vaapi_20091015.patch ======================================= --- /trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-mt_20091006.patch Sun Oct 18 18:19:09 2009 +++ /trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-mt_20091006.patch Sat Oct 24 07:54:29 2009 @@ -1,6 +1,6 @@ -diff -Naur ffmpeg-20304.29779-old/doc/multithreading.txt ffmpeg-20304.29779-new/doc/multithreading.txt ---- ffmpeg-20304.29779-old/doc/multithreading.txt 1969-12-31 16:00:00.000000000 -0800 -+++ ffmpeg-20304.29779-new/doc/multithreading.txt 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/doc/multithreading.txt ffmpeg-20361.29796-new/doc/multithreading.txt +--- ffmpeg-20361.29796-old/doc/multithreading.txt 1969-12-31 16:00:00.000000000 -0800 ++++ ffmpeg-20361.29796-new/doc/multithreading.txt 2009-10-24 07:16:54.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-20304.29779-old/ffmpeg.c ffmpeg-20304.29779-new/ffmpeg.c ---- ffmpeg-20304.29779-old/ffmpeg.c 2009-10-18 17:10:46.000000000 -0700 -+++ ffmpeg-20304.29779-new/ffmpeg.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/ffmpeg.c ffmpeg-20361.29796-new/ffmpeg.c +--- ffmpeg-20361.29796-old/ffmpeg.c 2009-10-24 07:16:38.000000000 -0700 ++++ ffmpeg-20361.29796-new/ffmpeg.c 2009-10-24 07:16:54.000000000 -0700 @@ -495,11 +495,6 @@ else if (st->codec->codec_type == CODEC_TYPE_VIDEO && video_stream_copy) st->stream_copy = 1; @@ -119,9 +119,9 @@ audio_enc = st->codec; audio_enc->codec_type = CODEC_TYPE_AUDIO; -diff -Naur ffmpeg-20304.29779-old/ffplay.c ffmpeg-20304.29779-new/ffplay.c ---- ffmpeg-20304.29779-old/ffplay.c 2009-10-18 17:10:46.000000000 -0700 -+++ ffmpeg-20304.29779-new/ffplay.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/ffplay.c ffmpeg-20361.29796-new/ffplay.c +--- ffmpeg-20361.29796-old/ffplay.c 2009-10-24 07:16:38.000000000 -0700 ++++ ffmpeg-20361.29796-new/ffplay.c 2009-10-24 07:16:54.000000000 -0700 @@ -1719,6 +1719,7 @@ enc->skip_loop_filter= skip_loop_filter; enc->error_recognition= error_recognition; @@ -140,9 +140,9 @@ ic->streams[stream_index]->discard = AVDISCARD_DEFAULT; switch(enc->codec_type) { case CODEC_TYPE_AUDIO: -diff -Naur ffmpeg-20304.29779-old/libavcodec/avcodec.h ffmpeg-20304.29779-new/libavcodec/avcodec.h ---- ffmpeg-20304.29779-old/libavcodec/avcodec.h 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/avcodec.h 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/avcodec.h ffmpeg-20361.29796-new/libavcodec/avcodec.h +--- ffmpeg-20361.29796-old/libavcodec/avcodec.h 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/avcodec.h 2009-10-24 07:16:54.000000000 -0700 @@ -610,6 +610,10 @@ * Codec can output multiple frames per AVPacket */ @@ -283,9 +283,9 @@ } AVCodec; /** -diff -Naur ffmpeg-20304.29779-old/libavcodec/beosthread.c ffmpeg-20304.29779-new/libavcodec/beosthread.c ---- ffmpeg-20304.29779-old/libavcodec/beosthread.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/beosthread.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/beosthread.c ffmpeg-20361.29796-new/libavcodec/beosthread.c +--- ffmpeg-20361.29796-old/libavcodec/beosthread.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/beosthread.c 2009-10-24 07:16:54.000000000 -0700 @@ -121,7 +121,13 @@ int i; ThreadContext *c; @@ -300,9 +300,9 @@ assert(!s->thread_opaque); c= av_mallocz(sizeof(ThreadContext)*thread_count); -diff -Naur ffmpeg-20304.29779-old/libavcodec/dsputil.c ffmpeg-20304.29779-new/libavcodec/dsputil.c ---- ffmpeg-20304.29779-old/libavcodec/dsputil.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/dsputil.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/dsputil.c ffmpeg-20361.29796-new/libavcodec/dsputil.c +--- ffmpeg-20361.29796-old/libavcodec/dsputil.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/dsputil.c 2009-10-24 07:16:54.000000000 -0700 @@ -440,7 +440,7 @@ /* draw the edges of width 'w' of an image of size width, height */ @@ -343,9 +343,9 @@ } } -diff -Naur ffmpeg-20304.29779-old/libavcodec/dsputil.h ffmpeg-20304.29779-new/libavcodec/dsputil.h ---- ffmpeg-20304.29779-old/libavcodec/dsputil.h 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/dsputil.h 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/dsputil.h ffmpeg-20361.29796-new/libavcodec/dsputil.h +--- ffmpeg-20361.29796-old/libavcodec/dsputil.h 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/dsputil.h 2009-10-24 07:16:54.000000000 -0700 @@ -499,8 +499,10 @@ #define BASIS_SHIFT 16 #define RECON_SHIFT 6 @@ -358,9 +358,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-20304.29779-old/libavcodec/h263.c ffmpeg-20304.29779-new/libavcodec/h263.c ---- ffmpeg-20304.29779-old/libavcodec/h263.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/h263.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/h263.c ffmpeg-20361.29796-new/libavcodec/h263.c +--- ffmpeg-20361.29796-old/libavcodec/h263.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/h263.c 2009-10-24 07:16:54.000000000 -0700 @@ -41,6 +41,7 @@ #include "mpeg4data.h" #include "mathops.h" @@ -407,9 +407,9 @@ if(s->pict_type==FF_B_TYPE && s->next_picture.mbskip_table[xy + delta]) return SLICE_OK; return SLICE_END; -diff -Naur ffmpeg-20304.29779-old/libavcodec/h263dec.c ffmpeg-20304.29779-new/libavcodec/h263dec.c ---- ffmpeg-20304.29779-old/libavcodec/h263dec.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/h263dec.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/h263dec.c ffmpeg-20361.29796-new/libavcodec/h263dec.c +--- ffmpeg-20361.29796-old/libavcodec/h263dec.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/h263dec.c 2009-10-24 07:16:54.000000000 -0700 @@ -32,6 +32,7 @@ #include "h263_parser.h" #include "mpeg4video_parser.h" @@ -450,9 +450,9 @@ }; AVCodec h263_decoder = { -diff -Naur ffmpeg-20304.29779-old/libavcodec/h264.c ffmpeg-20304.29779-new/libavcodec/h264.c ---- ffmpeg-20304.29779-old/libavcodec/h264.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/h264.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/h264.c ffmpeg-20361.29796-new/libavcodec/h264.c +--- ffmpeg-20361.29796-old/libavcodec/h264.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/h264.c 2009-10-24 07:16:54.000000000 -0700 @@ -35,6 +35,7 @@ #include "golomb.h" #include "mathops.h" @@ -1390,9 +1390,9 @@ }; #if CONFIG_H264_VDPAU_DECODER -diff -Naur ffmpeg-20304.29779-old/libavcodec/h264.h ffmpeg-20304.29779-new/libavcodec/h264.h ---- ffmpeg-20304.29779-old/libavcodec/h264.h 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/h264.h 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/h264.h ffmpeg-20361.29796-new/libavcodec/h264.h +--- ffmpeg-20361.29796-old/libavcodec/h264.h 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/h264.h 2009-10-24 07:16:54.000000000 -0700 @@ -250,7 +250,7 @@ * Used to parse AVC variant of h264 */ @@ -1410,9 +1410,9 @@ int outputed_poc; /** -diff -Naur ffmpeg-20304.29779-old/libavcodec/huffyuv.c ffmpeg-20304.29779-new/libavcodec/huffyuv.c ---- ffmpeg-20304.29779-old/libavcodec/huffyuv.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/huffyuv.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/huffyuv.c ffmpeg-20361.29796-new/libavcodec/huffyuv.c +--- ffmpeg-20361.29796-old/libavcodec/huffyuv.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/huffyuv.c 2009-10-24 07:16:54.000000000 -0700 @@ -32,6 +32,7 @@ #include "get_bits.h" #include "put_bits.h" @@ -1485,9 +1485,9 @@ .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), }; #endif -diff -Naur ffmpeg-20304.29779-old/libavcodec/mdec.c ffmpeg-20304.29779-new/libavcodec/mdec.c ---- ffmpeg-20304.29779-old/libavcodec/mdec.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/mdec.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/mdec.c ffmpeg-20361.29796-new/libavcodec/mdec.c +--- ffmpeg-20361.29796-old/libavcodec/mdec.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/mdec.c 2009-10-24 07:16:54.000000000 -0700 @@ -31,6 +31,7 @@ #include "dsputil.h" #include "mpegvideo.h" @@ -1538,9 +1538,9 @@ + .init_copy= ONLY_IF_THREADS_ENABLED(decode_init_copy) }; -diff -Naur ffmpeg-20304.29779-old/libavcodec/mimic.c ffmpeg-20304.29779-new/libavcodec/mimic.c ---- ffmpeg-20304.29779-old/libavcodec/mimic.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/mimic.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/mimic.c ffmpeg-20361.29796-new/libavcodec/mimic.c +--- ffmpeg-20361.29796-old/libavcodec/mimic.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/mimic.c 2009-10-24 07:16:54.000000000 -0700 @@ -27,6 +27,7 @@ #include "get_bits.h" #include "bytestream.h" @@ -1692,9 +1692,9 @@ .long_name = NULL_IF_CONFIG_SMALL("Mimic"), + .update_context = ONLY_IF_THREADS_ENABLED(mimic_decode_update_context) }; -diff -Naur ffmpeg-20304.29779-old/libavcodec/mpeg12.c ffmpeg-20304.29779-new/libavcodec/mpeg12.c ---- ffmpeg-20304.29779-old/libavcodec/mpeg12.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/mpeg12.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/mpeg12.c ffmpeg-20361.29796-new/libavcodec/mpeg12.c +--- ffmpeg-20361.29796-old/libavcodec/mpeg12.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/mpeg12.c 2009-10-24 07:16:54.000000000 -0700 @@ -37,6 +37,7 @@ #include "bytestream.h" #include "vdpau_internal.h" @@ -1807,9 +1807,9 @@ return -1; if( !(avctx->slice_flags & SLICE_FLAG_CODED_ORDER) ) return -1; -diff -Naur ffmpeg-20304.29779-old/libavcodec/mpegvideo.c ffmpeg-20304.29779-new/libavcodec/mpegvideo.c ---- ffmpeg-20304.29779-old/libavcodec/mpegvideo.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/mpegvideo.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/mpegvideo.c ffmpeg-20361.29796-new/libavcodec/mpegvideo.c +--- ffmpeg-20361.29796-old/libavcodec/mpegvideo.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/mpegvideo.c 2009-10-24 07:16:54.000000000 -0700 @@ -35,6 +35,7 @@ #include "msmpeg4.h" #include "faandct.h" @@ -2238,9 +2238,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-20304.29779-old/libavcodec/mpegvideo_enc.c ffmpeg-20304.29779-new/libavcodec/mpegvideo_enc.c ---- ffmpeg-20304.29779-old/libavcodec/mpegvideo_enc.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/mpegvideo_enc.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/mpegvideo_enc.c ffmpeg-20361.29796-new/libavcodec/mpegvideo_enc.c +--- ffmpeg-20361.29796-old/libavcodec/mpegvideo_enc.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/mpegvideo_enc.c 2009-10-24 07:16:54.000000000 -0700 @@ -35,6 +35,7 @@ #include "msmpeg4.h" #include "h263.h" @@ -2329,9 +2329,9 @@ merge_context_after_encode(s, s->thread_context[i]); } emms_c(); -diff -Naur ffmpeg-20304.29779-old/libavcodec/mpegvideo.h ffmpeg-20304.29779-new/libavcodec/mpegvideo.h ---- ffmpeg-20304.29779-old/libavcodec/mpegvideo.h 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/mpegvideo.h 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/mpegvideo.h ffmpeg-20361.29796-new/libavcodec/mpegvideo.h +--- ffmpeg-20361.29796-old/libavcodec/mpegvideo.h 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/mpegvideo.h 2009-10-24 07:16:54.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) @@ -2368,9 +2368,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-20304.29779-old/libavcodec/options.c ffmpeg-20304.29779-new/libavcodec/options.c ---- ffmpeg-20304.29779-old/libavcodec/options.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/options.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/options.c ffmpeg-20361.29796-new/libavcodec/options.c +--- ffmpeg-20361.29796-old/libavcodec/options.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/options.c 2009-10-24 07:16:54.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"}, @@ -2389,9 +2389,9 @@ {NULL}, }; -diff -Naur ffmpeg-20304.29779-old/libavcodec/os2thread.c ffmpeg-20304.29779-new/libavcodec/os2thread.c ---- ffmpeg-20304.29779-old/libavcodec/os2thread.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/os2thread.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/os2thread.c ffmpeg-20361.29796-new/libavcodec/os2thread.c +--- ffmpeg-20361.29796-old/libavcodec/os2thread.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/os2thread.c 2009-10-24 07:16:54.000000000 -0700 @@ -114,7 +114,13 @@ ThreadContext *c; uint32_t threadid; @@ -2406,9 +2406,9 @@ assert(!s->thread_opaque); c= av_mallocz(sizeof(ThreadContext)*thread_count); -diff -Naur ffmpeg-20304.29779-old/libavcodec/pthread.c ffmpeg-20304.29779-new/libavcodec/pthread.c ---- ffmpeg-20304.29779-old/libavcodec/pthread.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/pthread.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/pthread.c ffmpeg-20361.29796-new/libavcodec/pthread.c +--- ffmpeg-20361.29796-old/libavcodec/pthread.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/pthread.c 2009-10-24 07:16:54.000000000 -0700 @@ -1,5 +1,6 @@ /* * Copyright (c) 2004 Roman Shaposhnik @@ -3043,9 +3043,9 @@ + else + thread_free(avctx); +} -diff -Naur ffmpeg-20304.29779-old/libavcodec/snow.c ffmpeg-20304.29779-new/libavcodec/snow.c ---- ffmpeg-20304.29779-old/libavcodec/snow.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/snow.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/snow.c ffmpeg-20361.29796-new/libavcodec/snow.c +--- ffmpeg-20361.29796-old/libavcodec/snow.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/snow.c 2009-10-24 07:16:54.000000000 -0700 @@ -2648,9 +2648,9 @@ int h= s->avctx->height; @@ -3059,9 +3059,9 @@ } release_buffer(s->avctx); -diff -Naur ffmpeg-20304.29779-old/libavcodec/thread.h ffmpeg-20304.29779-new/libavcodec/thread.h ---- ffmpeg-20304.29779-old/libavcodec/thread.h 1969-12-31 16:00:00.000000000 -0800 -+++ ffmpeg-20304.29779-new/libavcodec/thread.h 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/thread.h ffmpeg-20361.29796-new/libavcodec/thread.h +--- ffmpeg-20361.29796-old/libavcodec/thread.h 1969-12-31 16:00:00.000000000 -0800 ++++ ffmpeg-20361.29796-new/libavcodec/thread.h 2009-10-24 07:16:54.000000000 -0700 @@ -0,0 +1,139 @@ +/* + * Multithreading support @@ -3202,9 +3202,9 @@ +#endif + +#endif /* AVCODEC_THREAD_H */ -diff -Naur ffmpeg-20304.29779-old/libavcodec/utils.c ffmpeg-20304.29779-new/libavcodec/utils.c ---- ffmpeg-20304.29779-old/libavcodec/utils.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/utils.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/utils.c ffmpeg-20361.29796-new/libavcodec/utils.c +--- ffmpeg-20361.29796-old/libavcodec/utils.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/utils.c 2009-10-24 07:16:54.000000000 -0700 @@ -35,6 +35,7 @@ #include "dsputil.h" #include "opt.h" @@ -3301,9 +3301,9 @@ if(avctx->codec->flush) avctx->codec->flush(avctx); } -diff -Naur ffmpeg-20304.29779-old/libavcodec/vp3.c ffmpeg-20304.29779-new/libavcodec/vp3.c ---- ffmpeg-20304.29779-old/libavcodec/vp3.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/vp3.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/vp3.c ffmpeg-20361.29796-new/libavcodec/vp3.c +--- ffmpeg-20361.29796-old/libavcodec/vp3.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/vp3.c 2009-10-24 07:16:54.000000000 -0700 @@ -39,6 +39,7 @@ #include "vp3data.h" @@ -3733,9 +3733,9 @@ .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"), + .update_context = ONLY_IF_THREADS_ENABLED(vp3_update_context), }; -diff -Naur ffmpeg-20304.29779-old/libavcodec/w32thread.c ffmpeg-20304.29779-new/libavcodec/w32thread.c ---- ffmpeg-20304.29779-old/libavcodec/w32thread.c 2009-10-18 17:10:43.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/w32thread.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/w32thread.c ffmpeg-20361.29796-new/libavcodec/w32thread.c +--- ffmpeg-20361.29796-old/libavcodec/w32thread.c 2009-10-24 07:16:36.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/w32thread.c 2009-10-24 07:16:54.000000000 -0700 @@ -128,7 +128,13 @@ ThreadContext *c; uint32_t threadid; @@ -3750,9 +3750,9 @@ assert(!s->thread_opaque); c= av_mallocz(sizeof(ThreadContext)*thread_count); -diff -Naur ffmpeg-20304.29779-old/libavcodec/x86/dsputil_mmx.c ffmpeg-20304.29779-new/libavcodec/x86/dsputil_mmx.c ---- ffmpeg-20304.29779-old/libavcodec/x86/dsputil_mmx.c 2009-10-18 17:10:35.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/x86/dsputil_mmx.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/x86/dsputil_mmx.c ffmpeg-20361.29796-new/libavcodec/x86/dsputil_mmx.c +--- ffmpeg-20361.29796-old/libavcodec/x86/dsputil_mmx.c 2009-10-24 07:16:31.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/x86/dsputil_mmx.c 2009-10-24 07:16:54.000000000 -0700 @@ -807,7 +807,7 @@ /* draw the edges of width 'w' of an image of size width, height @@ -3830,9 +3830,9 @@ } } -diff -Naur ffmpeg-20304.29779-old/libavutil/internal.h ffmpeg-20304.29779-new/libavutil/internal.h ---- ffmpeg-20304.29779-old/libavutil/internal.h 2009-10-18 17:10:31.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavutil/internal.h 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavutil/internal.h ffmpeg-20361.29796-new/libavutil/internal.h +--- ffmpeg-20361.29796-old/libavutil/internal.h 2009-10-24 07:16:26.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavutil/internal.h 2009-10-24 07:16:54.000000000 -0700 @@ -327,4 +327,10 @@ # define NULL_IF_CONFIG_SMALL(x) x #endif @@ -3844,9 +3844,9 @@ +#endif + #endif /* AVUTIL_INTERNAL_H */ -diff -Naur ffmpeg-20304.29779-old/libavutil/log.c ffmpeg-20304.29779-new/libavutil/log.c ---- ffmpeg-20304.29779-old/libavutil/log.c 2009-10-18 17:10:31.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavutil/log.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavutil/log.c ffmpeg-20361.29796-new/libavutil/log.c +--- ffmpeg-20361.29796-old/libavutil/log.c 2009-10-24 07:16:26.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavutil/log.c 2009-10-24 07:16:54.000000000 -0700 @@ -35,6 +35,8 @@ static int count; static char line[1024], prev[1024]; ======================================= --- /trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-vaapi_20091015.patch Sun Oct 18 18:19:09 2009 +++ /trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-vaapi_20091015.patch Sat Oct 24 07:54:29 2009 @@ -1,7 +1,7 @@ -diff -Naur ffmpeg-20304.29779-old/configure ffmpeg-20304.29779-new/configure ---- ffmpeg-20304.29779-old/configure 2009-10-18 17:11:03.000000000 -0700 -+++ ffmpeg-20304.29779-new/configure 2009-10-18 17:11:03.000000000 -0700 -@@ -2798,6 +2798,27 @@ +diff -Naur ffmpeg-20361.29796-old/configure ffmpeg-20361.29796-new/configure +--- ffmpeg-20361.29796-old/configure 2009-10-24 07:16:54.000000000 -0700 ++++ ffmpeg-20361.29796-new/configure 2009-10-24 07:16:54.000000000 -0700 +@@ -2808,6 +2808,27 @@ done fi @@ -29,9 +29,9 @@ # build pkg-config files -diff -Naur ffmpeg-20304.29779-old/libavcodec/allcodecs.c ffmpeg-20304.29779-new/libavcodec/allcodecs.c ---- ffmpeg-20304.29779-old/libavcodec/allcodecs.c 2009-10-18 17:11:03.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/allcodecs.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/allcodecs.c ffmpeg-20361.29796-new/libavcodec/allcodecs.c +--- ffmpeg-20361.29796-old/libavcodec/allcodecs.c 2009-10-24 07:16:54.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/allcodecs.c 2009-10-24 07:16:54.000000000 -0700 @@ -55,6 +55,7 @@ /* hardware accelerators */ @@ -40,9 +40,9 @@ REGISTER_HWACCEL (MPEG2_VAAPI, mpeg2_vaapi); REGISTER_HWACCEL (MPEG4_VAAPI, mpeg4_vaapi); REGISTER_HWACCEL (VC1_VAAPI, vc1_vaapi); -diff -Naur ffmpeg-20304.29779-old/libavcodec/Makefile ffmpeg-20304.29779-new/libavcodec/Makefile ---- ffmpeg-20304.29779-old/libavcodec/Makefile 2009-10-18 17:11:03.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/Makefile 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/Makefile ffmpeg-20361.29796-new/libavcodec/Makefile +--- ffmpeg-20361.29796-old/libavcodec/Makefile 2009-10-24 07:16:54.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/Makefile 2009-10-24 07:16:54.000000000 -0700 @@ -3,7 +3,7 @@ NAME = avcodec FFLIBS = avutil @@ -52,7 +52,7 @@ OBJS = allcodecs.o \ audioconvert.o \ -@@ -136,6 +136,7 @@ +@@ -137,6 +137,7 @@ h264_parser.o cabac.o \ mpegvideo.o error_resilience.o OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dspenc.o @@ -60,9 +60,9 @@ OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o -diff -Naur ffmpeg-20304.29779-old/libavcodec/vaapi_h264.c ffmpeg-20304.29779-new/libavcodec/vaapi_h264.c ---- ffmpeg-20304.29779-old/libavcodec/vaapi_h264.c 1969-12-31 16:00:00.000000000 -0800 -+++ ffmpeg-20304.29779-new/libavcodec/vaapi_h264.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/vaapi_h264.c ffmpeg-20361.29796-new/libavcodec/vaapi_h264.c +--- ffmpeg-20361.29796-old/libavcodec/vaapi_h264.c 1969-12-31 16:00:00.000000000 -0800 ++++ ffmpeg-20361.29796-new/libavcodec/vaapi_h264.c 2009-10-24 07:16:54.000000000 -0700 @@ -0,0 +1,353 @@ +/* + * H.264 HW decode acceleration through VA API @@ -417,9 +417,9 @@ + .decode_slice = decode_slice, + .priv_data_size = 0, +}; -diff -Naur ffmpeg-20304.29779-old/libavcodec/x86/dsputil_mmx.c ffmpeg-20304.29779-new/libavcodec/x86/dsputil_mmx.c ---- ffmpeg-20304.29779-old/libavcodec/x86/dsputil_mmx.c 2009-10-18 17:11:03.000000000 -0700 -+++ ffmpeg-20304.29779-new/libavcodec/x86/dsputil_mmx.c 2009-10-18 17:11:03.000000000 -0700 +diff -Naur ffmpeg-20361.29796-old/libavcodec/x86/dsputil_mmx.c ffmpeg-20361.29796-new/libavcodec/x86/dsputil_mmx.c +--- ffmpeg-20361.29796-old/libavcodec/x86/dsputil_mmx.c 2009-10-24 07:16:54.000000000 -0700 ++++ ffmpeg-20361.29796-new/libavcodec/x86/dsputil_mmx.c 2009-10-24 07:16:54.000000000 -0700 @@ -2670,7 +2670,9 @@ c->add_pixels_clamped = add_pixels_clamped_mmx; c->clear_block = clear_block_mmx; ======================================= --- /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums Sun Oct 18 18:19:09 2009 +++ /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums Sat Oct 24 07:54:29 2009 @@ -1,3 +1,3 @@ -1606fdff8eef5f914a7468ec71abdcad download/MPlayer-mt_20091006.patch -ddc8259d762bb1e219bfe68766a7acc2 download/MPlayer-gcc_4.4.0_hack.patch -2236856ba4cb33fe383d7726fc96c152 download/MPlayer-vaapi_20091015.patch +835a6b063fa4345badd731fe2bc2fce2 download/MPlayer-mt_20091006.patch +bd81266d2b30f935ff5f3c0507e75615 download/MPlayer-gcc_4.4.0_hack.patch +ca37bdf3e8c69282690ec94c0fc4a651 download/MPlayer-vaapi_20091015.patch ======================================= --- /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-gcc_4.4.0_hack.patch Sun Oct 18 18:19:09 2009 +++ /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-gcc_4.4.0_hack.patch Sat Oct 24 07:54:29 2009 @@ -1,6 +1,6 @@ -diff -Naur MPlayer-29779-old/configure MPlayer-29779-new/configure ---- MPlayer-29779-old/configure 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/configure 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/configure MPlayer-29796-new/configure +--- MPlayer-29796-old/configure 2009-10-24 07:19:09.000000000 -0700 ++++ MPlayer-29796-new/configure 2009-10-24 07:19:10.000000000 -0700 @@ -2423,8 +2423,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_20091006.patch Sun Oct 18 18:19:09 2009 +++ /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-mt_20091006.patch Sat Oct 24 07:54:29 2009 @@ -1,6 +1,6 @@ -diff -Naur MPlayer-29779-old/libmpcodecs/vd_ffmpeg.c MPlayer-29779-new/libmpcodecs/vd_ffmpeg.c ---- MPlayer-29779-old/libmpcodecs/vd_ffmpeg.c 2009-10-18 17:04:46.000000000 -0700 -+++ MPlayer-29779-new/libmpcodecs/vd_ffmpeg.c 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libmpcodecs/vd_ffmpeg.c MPlayer-29796-new/libmpcodecs/vd_ffmpeg.c +--- MPlayer-29796-old/libmpcodecs/vd_ffmpeg.c 2009-10-24 07:18:15.000000000 -0700 ++++ MPlayer-29796-new/libmpcodecs/vd_ffmpeg.c 2009-10-24 07:19:09.000000000 -0700 @@ -145,7 +145,12 @@ avcodec_flush_buffers(avctx); return CONTROL_TRUE; @@ -15,9 +15,9 @@ } return CONTROL_UNKNOWN; } -diff -Naur MPlayer-29779-old/libvo/vo_corevideo.m MPlayer-29779-new/libvo/vo_corevideo.m ---- MPlayer-29779-old/libvo/vo_corevideo.m 2009-10-18 17:04:53.000000000 -0700 -+++ MPlayer-29779-new/libvo/vo_corevideo.m 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libvo/vo_corevideo.m MPlayer-29796-new/libvo/vo_corevideo.m +--- MPlayer-29796-old/libvo/vo_corevideo.m 2009-10-24 07:18:19.000000000 -0700 ++++ MPlayer-29796-new/libvo/vo_corevideo.m 2009-10-24 07:19:09.000000000 -0700 @@ -500,6 +500,8 @@ NSRect frame; CVReturn error = kCVReturnSuccess; ======================================= --- /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-vaapi_20091015.patch Sun Oct 18 18:19:09 2009 +++ /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-vaapi_20091015.patch Sat Oct 24 07:54:29 2009 @@ -1,6 +1,6 @@ -diff -Naur MPlayer-29779-old/cfg-common-opts.h MPlayer-29779-new/cfg-common-opts.h ---- MPlayer-29779-old/cfg-common-opts.h 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/cfg-common-opts.h 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/cfg-common-opts.h MPlayer-29796-new/cfg-common-opts.h +--- MPlayer-29796-old/cfg-common-opts.h 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/cfg-common-opts.h 2009-10-24 07:19:10.000000000 -0700 @@ -228,6 +228,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-29779-old/codec-cfg.c MPlayer-29779-new/codec-cfg.c ---- MPlayer-29779-old/codec-cfg.c 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/codec-cfg.c 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/codec-cfg.c MPlayer-29796-new/codec-cfg.c +--- MPlayer-29796-old/codec-cfg.c 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/codec-cfg.c 2009-10-24 07:19:10.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-29779-old/configure MPlayer-29779-new/configure ---- MPlayer-29779-old/configure 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/configure 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/configure MPlayer-29796-new/configure +--- MPlayer-29796-old/configure 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/configure 2009-10-24 07:19:10.000000000 -0700 @@ -354,6 +354,9 @@ --disable-muxer=MUXER disable specified FFmpeg muxer --enable-muxer=MUXER enable specified FFmpeg muxer @@ -205,7 +205,7 @@ echocheck "PNG support" if test "$_png" = auto ; then -@@ -8360,6 +8476,7 @@ +@@ -8359,6 +8475,7 @@ TWOLAME=$_twolame UNRAR_EXEC = $_unrar_exec V4L2 = $_v4l2 @@ -262,7 +262,7 @@ $def_vdpau $def_vesa $def_vidix -@@ -8938,6 +9062,7 @@ +@@ -8939,6 +9063,7 @@ $def_x264_lavc $def_xvid_lavc @@ -270,7 +270,7 @@ $(ff_config_enable "$_libavdecoders_all" "$_libavdecoders") $(ff_config_enable "$_libavencoders_all" "$_libavencoders") $(ff_config_enable "$_libavparsers_all" "$_libavparsers") -@@ -8946,13 +9071,6 @@ +@@ -8947,13 +9072,6 @@ $(ff_config_enable "$_libavprotocols_all" "$_libavprotocols") $(ff_config_enable "$_libavbsfs_all" "$_libavbsfs") @@ -284,9 +284,9 @@ #endif /* MPLAYER_CONFIG_H */ EOF -diff -Naur MPlayer-29779-old/etc/codecs.conf MPlayer-29779-new/etc/codecs.conf ---- MPlayer-29779-old/etc/codecs.conf 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/etc/codecs.conf 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/etc/codecs.conf MPlayer-29796-new/etc/codecs.conf +--- MPlayer-29796-old/etc/codecs.conf 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/etc/codecs.conf 2009-10-24 07:19:10.000000000 -0700 @@ -164,6 +164,7 @@ fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg @@ -327,7 +327,7 @@ out YV12,I420,IYUV videocodec ffwv1f -@@ -1478,6 +1483,7 @@ +@@ -1471,6 +1476,7 @@ fourcc VX1K ; Agora Labs VX1000S H263 driver ffmpeg dll h263 @@ -335,9 +335,9 @@ out YV12,I420,IYUV videocodec ffzygo -diff -Naur MPlayer-29779-old/fmt-conversion.c MPlayer-29779-new/fmt-conversion.c ---- MPlayer-29779-old/fmt-conversion.c 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/fmt-conversion.c 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/fmt-conversion.c MPlayer-29796-new/fmt-conversion.c +--- MPlayer-29796-old/fmt-conversion.c 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/fmt-conversion.c 2009-10-24 07:19:10.000000000 -0700 @@ -18,12 +18,14 @@ #include "mp_msg.h" @@ -388,9 +388,9 @@ break; fmt = conversion_map[i].fmt; if (!fmt) -diff -Naur MPlayer-29779-old/fmt-conversion.h MPlayer-29779-new/fmt-conversion.h ---- MPlayer-29779-old/fmt-conversion.h 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/fmt-conversion.h 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/fmt-conversion.h MPlayer-29796-new/fmt-conversion.h +--- MPlayer-29796-old/fmt-conversion.h 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/fmt-conversion.h 2009-10-24 07:19:10.000000000 -0700 @@ -4,6 +4,6 @@ #include "libavutil/avutil.h" @@ -399,9 +399,9 @@ +int pixfmt2imgfmt(enum PixelFormat pix_fmt, int codec_id); #endif /* MPLAYER_FMT_CONVERSION_H */ -diff -Naur MPlayer-29779-old/gui/mplayer/gtk/opts.c MPlayer-29779-new/gui/mplayer/gtk/opts.c ---- MPlayer-29779-old/gui/mplayer/gtk/opts.c 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/gui/mplayer/gtk/opts.c 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/gui/mplayer/gtk/opts.c MPlayer-29796-new/gui/mplayer/gtk/opts.c +--- MPlayer-29796-old/gui/mplayer/gtk/opts.c 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/gui/mplayer/gtk/opts.c 2009-10-24 07:19:10.000000000 -0700 @@ -63,9 +63,11 @@ GtkWidget * prEFontName; GtkWidget * prEDVDDevice; @@ -480,9 +480,9 @@ AddLabel( MSGTR_PREFERENCES_VideoCodecFamily,hbox5 ); CBVFM=gtk_combo_new(); -diff -Naur MPlayer-29779-old/help/help_mp-en.h MPlayer-29779-new/help/help_mp-en.h ---- MPlayer-29779-old/help/help_mp-en.h 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/help/help_mp-en.h 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/help/help_mp-en.h MPlayer-29796-new/help/help_mp-en.h +--- MPlayer-29796-old/help/help_mp-en.h 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/help/help_mp-en.h 2009-10-24 07:19:10.000000000 -0700 @@ -718,6 +718,7 @@ #define MSGTR_PREFERENCES_IDX "Rebuild index table, if needed" #define MSGTR_PREFERENCES_VideoCodecFamily "Video codec family:" @@ -499,9 +499,9 @@ // libmpcodecs/ve_lavc.c #define MSGTR_MPCODECS_HighQualityEncodingSelected "[VE_LAVC] High quality encoding selected (non-realtime)!\n" -diff -Naur MPlayer-29779-old/libmpcodecs/dec_video.c MPlayer-29779-new/libmpcodecs/dec_video.c ---- MPlayer-29779-old/libmpcodecs/dec_video.c 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/libmpcodecs/dec_video.c 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libmpcodecs/dec_video.c MPlayer-29796-new/libmpcodecs/dec_video.c +--- MPlayer-29796-old/libmpcodecs/dec_video.c 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/libmpcodecs/dec_video.c 2009-10-24 07:19:10.000000000 -0700 @@ -39,9 +39,47 @@ int field_dominance=-1; @@ -550,9 +550,9 @@ int get_video_quality_max(sh_video_t *sh_video){ vf_instance_t* vf=sh_video->vfilter; if(vf){ -diff -Naur MPlayer-29779-old/libmpcodecs/dec_video.h MPlayer-29779-new/libmpcodecs/dec_video.h ---- MPlayer-29779-old/libmpcodecs/dec_video.h 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/libmpcodecs/dec_video.h 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libmpcodecs/dec_video.h MPlayer-29796-new/libmpcodecs/dec_video.h +--- MPlayer-29796-old/libmpcodecs/dec_video.h 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/libmpcodecs/dec_video.h 2009-10-24 07:19:10.000000000 -0700 @@ -3,6 +3,14 @@ #include "libmpdemux/stheader.h" @@ -580,9 +580,9 @@ +extern char *video_hwaccel_name; #endif /* MPLAYER_DEC_VIDEO_H */ -diff -Naur MPlayer-29779-old/libmpcodecs/img_format.c MPlayer-29779-new/libmpcodecs/img_format.c ---- MPlayer-29779-old/libmpcodecs/img_format.c 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/libmpcodecs/img_format.c 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libmpcodecs/img_format.c MPlayer-29796-new/libmpcodecs/img_format.c +--- MPlayer-29796-old/libmpcodecs/img_format.c 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/libmpcodecs/img_format.c 2009-10-24 07:19:10.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"; @@ -598,10 +598,10 @@ 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-29779-old/libmpcodecs/img_format.h MPlayer-29779-new/libmpcodecs/img_format.h ---- MPlayer-29779-old/libmpcodecs/img_format.h 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/libmpcodecs/img_format.h 2009-10-18 17:05:53.000000000 -0700 -@@ -109,6 +109,26 @@ +diff -Naur MPlayer-29796-old/libmpcodecs/img_format.h MPlayer-29796-new/libmpcodecs/img_format.h +--- MPlayer-29796-old/libmpcodecs/img_format.h 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/libmpcodecs/img_format.h 2009-10-24 07:19:10.000000000 -0700 +@@ -111,6 +111,26 @@ #define IMGFMT_XVMC_MOCO_MPEG2 (IMGFMT_XVMC|0x02) #define IMGFMT_XVMC_IDCT_MPEG2 (IMGFMT_XVMC|0x82) @@ -628,9 +628,9 @@ // VDPAU specific format. #define IMGFMT_VDPAU 0x1DC80000 #define IMGFMT_VDPAU_MASK 0xFFFF0000 -diff -Naur MPlayer-29779-old/libmpcodecs/mp_image.h MPlayer-29779-new/libmpcodecs/mp_image.h ---- MPlayer-29779-old/libmpcodecs/mp_image.h 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/libmpcodecs/mp_image.h 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libmpcodecs/mp_image.h MPlayer-29796-new/libmpcodecs/mp_image.h +--- MPlayer-29796-old/libmpcodecs/mp_image.h 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/libmpcodecs/mp_image.h 2009-10-24 07:19:10.000000000 -0700 @@ -111,6 +111,7 @@ // compressed formats if(out_fmt == IMGFMT_MPEGPES || @@ -639,9 +639,9 @@ IMGFMT_IS_VDPAU(out_fmt) || IMGFMT_IS_XVMC(out_fmt)){ mpi->bpp=0; return; -diff -Naur MPlayer-29779-old/libmpcodecs/vd.c MPlayer-29779-new/libmpcodecs/vd.c ---- MPlayer-29779-old/libmpcodecs/vd.c 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/libmpcodecs/vd.c 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libmpcodecs/vd.c MPlayer-29796-new/libmpcodecs/vd.c +--- MPlayer-29796-old/libmpcodecs/vd.c 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/libmpcodecs/vd.c 2009-10-24 07:19:10.000000000 -0700 @@ -348,3 +348,12 @@ if(vf->draw_slice) vf->draw_slice(vf,src,stride,w,h,x,y); @@ -655,9 +655,9 @@ + return ctx; + return NULL; +} -diff -Naur MPlayer-29779-old/libmpcodecs/vd_ffmpeg.c MPlayer-29779-new/libmpcodecs/vd_ffmpeg.c ---- MPlayer-29779-old/libmpcodecs/vd_ffmpeg.c 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/libmpcodecs/vd_ffmpeg.c 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libmpcodecs/vd_ffmpeg.c MPlayer-29796-new/libmpcodecs/vd_ffmpeg.c +--- MPlayer-29796-old/libmpcodecs/vd_ffmpeg.c 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/libmpcodecs/vd_ffmpeg.c 2009-10-24 07:19:10.000000000 -0700 @@ -14,6 +14,7 @@ #include "fmt-conversion.h" @@ -837,9 +837,9 @@ } -#endif /* CONFIG_XVMC || CONFIG_VDPAU */ +#endif /* CONFIG_XVMC || CONFIG_VAAPI || CONFIG_VDPAU */ -diff -Naur MPlayer-29779-old/libmpcodecs/vd.h MPlayer-29779-new/libmpcodecs/vd.h ---- MPlayer-29779-old/libmpcodecs/vd.h 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/libmpcodecs/vd.h 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libmpcodecs/vd.h MPlayer-29796-new/libmpcodecs/vd.h +--- MPlayer-29796-old/libmpcodecs/vd.h 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/libmpcodecs/vd.h 2009-10-24 07:19:10.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); @@ -848,9 +848,9 @@ #define VDFLAGS_DROPFRAME 3 -diff -Naur MPlayer-29779-old/libmpcodecs/vf.h MPlayer-29779-new/libmpcodecs/vf.h ---- MPlayer-29779-old/libmpcodecs/vf.h 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/libmpcodecs/vf.h 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libmpcodecs/vf.h MPlayer-29796-new/libmpcodecs/vf.h +--- MPlayer-29796-old/libmpcodecs/vf.h 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/libmpcodecs/vf.h 2009-10-24 07:19:10.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 */ @@ -859,9 +859,9 @@ #include "vfcap.h" -diff -Naur MPlayer-29779-old/libmpcodecs/vf_vo.c MPlayer-29779-new/libmpcodecs/vf_vo.c ---- MPlayer-29779-old/libmpcodecs/vf_vo.c 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/libmpcodecs/vf_vo.c 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libmpcodecs/vf_vo.c MPlayer-29796-new/libmpcodecs/vf_vo.c +--- MPlayer-29796-old/libmpcodecs/vf_vo.c 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/libmpcodecs/vf_vo.c 2009-10-24 07:19:10.000000000 -0700 @@ -151,6 +151,12 @@ *(double *)data = vf->priv->pts; return CONTROL_TRUE; @@ -883,9 +883,9 @@ IMGFMT_IS_XVMC(mpi->imgfmt) || IMGFMT_IS_VDPAU(mpi->imgfmt)) video_out->control(VOCTRL_GET_IMAGE,mpi); } -diff -Naur MPlayer-29779-old/libvo/stats.c MPlayer-29779-new/libvo/stats.c ---- MPlayer-29779-old/libvo/stats.c 1969-12-31 16:00:00.000000000 -0800 -+++ MPlayer-29779-new/libvo/stats.c 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libvo/stats.c MPlayer-29796-new/libvo/stats.c +--- MPlayer-29796-old/libvo/stats.c 1969-12-31 16:00:00.000000000 -0800 ++++ MPlayer-29796-new/libvo/stats.c 2009-10-24 07:19:10.000000000 -0700 @@ -0,0 +1,217 @@ +#include "config.h" +#include "stats.h" @@ -1104,9 +1104,9 @@ +#endif + return error; +} -diff -Naur MPlayer-29779-old/libvo/stats.h MPlayer-29779-new/libvo/stats.h ---- MPlayer-29779-old/libvo/stats.h 1969-12-31 16:00:00.000000000 -0800 -+++ MPlayer-29779-new/libvo/stats.h 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libvo/stats.h MPlayer-29796-new/libvo/stats.h +--- MPlayer-29796-old/libvo/stats.h 1969-12-31 16:00:00.000000000 -0800 ++++ MPlayer-29796-new/libvo/stats.h 2009-10-24 07:19:10.000000000 -0700 @@ -0,0 +1,21 @@ +#ifndef MPLAYER_STATS_H +#define MPLAYER_STATS_H @@ -1129,9 +1129,9 @@ +float get_cpu_usage(enum CpuUsageType type); + +#endif /* MPLAYER_STATS_H */ -diff -Naur MPlayer-29779-old/libvo/video_out.c MPlayer-29779-new/libvo/video_out.c ---- MPlayer-29779-old/libvo/video_out.c 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/libvo/video_out.c 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libvo/video_out.c MPlayer-29796-new/libvo/video_out.c +--- MPlayer-29796-old/libvo/video_out.c 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/libvo/video_out.c 2009-10-24 07:19:10.000000000 -0700 @@ -132,6 +132,7 @@ extern vo_functions_t video_out_quartz; extern vo_functions_t video_out_pnm; @@ -1150,9 +1150,9 @@ NULL }; -diff -Naur MPlayer-29779-old/libvo/video_out.h MPlayer-29779-new/libvo/video_out.h ---- MPlayer-29779-old/libvo/video_out.h 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/libvo/video_out.h 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libvo/video_out.h MPlayer-29796-new/libvo/video_out.h +--- MPlayer-29796-old/libvo/video_out.h 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/libvo/video_out.h 2009-10-24 07:19:10.000000000 -0700 @@ -97,6 +97,10 @@ int w,h; } mp_win_t; @@ -1164,9 +1164,9 @@ #define VO_TRUE 1 #define VO_FALSE 0 #define VO_ERROR -1 -diff -Naur MPlayer-29779-old/libvo/vo_vaapi.c MPlayer-29779-new/libvo/vo_vaapi.c ---- MPlayer-29779-old/libvo/vo_vaapi.c 1969-12-31 16:00:00.000000000 -0800 -+++ MPlayer-29779-new/libvo/vo_vaapi.c 2009-10-18 17:05:53.000000000 -0700 +diff -Naur MPlayer-29796-old/libvo/vo_vaapi.c MPlayer-29796-new/libvo/vo_vaapi.c +--- MPlayer-29796-old/libvo/vo_vaapi.c 1969-12-31 16:00:00.000000000 -0800 ++++ MPlayer-29796-new/libvo/vo_vaapi.c 2009-10-24 07:19:10.000000000 -0700 @@ -0,0 +1,1550 @@ +/* + * VA API output module @@ -2718,10 +2718,10 @@ + } + return VO_NOTIMPL; +} -diff -Naur MPlayer-29779-old/Makefile MPlayer-29779-new/Makefile ---- MPlayer-29779-old/Makefile 2009-10-18 17:05:53.000000000 -0700 -+++ MPlayer-29779-new/Makefile 2009-10-18 17:05:53.000000000 -0700 -@@ -615,6 +615,7 @@ +diff -Naur MPlayer-29796-old/Makefile MPlayer-29796-new/Makefile +--- MPlayer-29796-old/Makefile 2009-10-24 07:19:10.000000000 -0700 ++++ MPlayer-29796-new/Makefile 2009-10-24 07:19:10.000000000 -0700 +@@ -612,6 +612,7 @@ SRCS_MPLAYER-$(TGA) += libvo/vo_tga.c SRCS_MPLAYER-$(V4L2) += libvo/vo_v4l2.c SRCS_MPLAYER-$(V4L2) += libao2/ao_v4l2.c @@ -2729,7 +2729,7 @@ SRCS_MPLAYER-$(VDPAU) += libvo/vo_vdpau.c SRCS_MPLAYER-$(VESA) += libvo/gtf.c libvo/vo_vesa.c libvo/vesa_lvo.c SRCS_MPLAYER-$(VIDIX) += libvo/vo_cvidix.c \ -@@ -668,6 +669,7 @@ +@@ -665,6 +666,7 @@ libvo/aspect.c \ libvo/geometry.c \ libvo/spuenc.c \ ======================================= --- /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk Sun Oct 18 18:19:09 2009 +++ /trunk/gar-minimyth/script/mediaplayers/mplayer-svn/package-api.mk Sat Oct 24 07:54:29 2009 @@ -1,1 +1,1 @@ -MPLAYER_TRUNK_VERSION=29779 +MPLAYER_TRUNK_VERSION=29796 --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
