On Wed, 11 Apr 2007 12:27:17 +0200 (CEST)
Antoine Jacoutot <[EMAIL PROTECTED]> wrote:

> Hi.
> 
> The included diff
> - updates ffmpeg to CVS version 20070407
> - adds x264 support
> 
> Note that adding libtheora and xvid support could be interesting too, 
> but I leave this to the maintainer ;-)
> Tested under i386.
> 
> Comments, Ok?

Here is an updated version of your update to the ffmpeg port.

I have included some fixes for the H.264 & VC1 decoders taken
from the SVN repo. I also bumped the major revs of all of the
libraries. There have been API additions as well as what looks
like existing APIs renamed or removed, so to be on the safe
side we should just bump the majors.

Thanks, I need this for an update of xine-lib to be able to use
ffmpeg's native VC1 decoder, instead of the win32 binary as the
current version of xine-lib uses, even with a newer ffmpeg being
installed.

Tested with Kaffeine/VLC and xine-ui with MPEG/MPEG4/H.264/WMV3/Xvid
and a few other formats on i386.

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile    2 Mar 2007 23:38:28 -0000       1.26
+++ Makefile    11 Apr 2007 22:17:26 -0000
@@ -2,12 +2,12 @@
 
 COMMENT=       "audio/video converter and streamer with bktr(4) support"
 
-DISTNAME=              ffmpeg-cvs-20070110
-PKGNAME=               ${DISTNAME:S/-cvs//}p1
-SHARED_LIBS=           avutil          2.0 \
-                       avcodec         8.0 \
-                       avformat        8.0 \
-                       postproc        8.0
+DISTNAME=              ffmpeg-cvs-20070407
+PKGNAME=               ${DISTNAME:S/-cvs//}
+SHARED_LIBS=           avutil          3.0 \
+                       avcodec         9.0 \
+                       avformat        9.0 \
+                       postproc        9.0
 CATEGORIES=            graphics multimedia
 
 HOMEPAGE=              http://www.ffmpeg.org/
@@ -27,7 +27,9 @@ LIB_DEPENDS=          SDL.>=4::devel/sdl \
                        faac::audio/faac \
                        faad::audio/faad \
                        mp3lame.>=0.1::audio/lame \
-                       vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis
+                       vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis \
+                       a52::audio/liba52 \
+                       x264::multimedia/x264
 
 WANTLIB=               X11 Xext c freetype m pthread ogg ossaudio usbhid z
 
@@ -43,16 +45,17 @@ CONFIGURE_STYLE=    simple
 CONFIGURE_ARGS+=       ${CONFIGURE_SHARED} \
                        --cc=${CC} \
                        --disable-opts \
-                       --enable-a52 \
+                       --enable-liba52 \
                        --enable-pp \
                        --enable-gpl \
                        --enable-pthreads \
                        --disable-debug \
-                       --enable-faac \
-                       --enable-faad \
-                       --enable-mp3lame \
+                       --enable-libfaac \
+                       --enable-libfaad \
+                       --enable-libmp3lame \
                        --enable-libogg \
-                       --enable-vorbis \
+                       --enable-libvorbis \
+                       --enable-x264 \
                        --extra-libs="-L${LOCALBASE}/lib" \
                        --extra-cflags=-I${LOCALBASE}/include
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo    5 Apr 2007 16:19:55 -0000       1.12
+++ distinfo    11 Apr 2007 21:12:12 -0000
@@ -1,5 +1,5 @@
-MD5 (ffmpeg-cvs-20070110.tar.gz) = r3KEoeT0mi+FjlxlN7N2/w==
-RMD160 (ffmpeg-cvs-20070110.tar.gz) = oIacGOJ5H5jR55HkZfmyA4mTSXw=
-SHA1 (ffmpeg-cvs-20070110.tar.gz) = 1MuBCqHaZ7wjHhAJVEMV32JRBeo=
-SHA256 (ffmpeg-cvs-20070110.tar.gz) = 
TA5XN14puseXcV7JEcX3RQJq1rWB4tXYecZ0kBMdWrk=
-SIZE (ffmpeg-cvs-20070110.tar.gz) = 2471143
+MD5 (ffmpeg-cvs-20070407.tar.gz) = om00SbfOQ3b9RcuKdZAl3A==
+RMD160 (ffmpeg-cvs-20070407.tar.gz) = 1rkRqTcQipwN/u7ezIKpqDq1Y9s=
+SHA1 (ffmpeg-cvs-20070407.tar.gz) = xE49MUKgqdb9Eh3lvAEDzGklO0Y=
+SHA256 (ffmpeg-cvs-20070407.tar.gz) = 
W/t54NrmSt2VF1BConxhqpZqowlRFzkVE9lEHcD66nE=
+SIZE (ffmpeg-cvs-20070407.tar.gz) = 2623030
Index: patches/patch-common_mak
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-common_mak,v
retrieving revision 1.3
diff -u -p -r1.3 patch-common_mak
--- patches/patch-common_mak    23 Jan 2007 09:34:45 -0000      1.3
+++ patches/patch-common_mak    11 Apr 2007 21:12:12 -0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-common_mak,v 1.3 2007/01/23 09:34:45 robert Exp $
---- common.mak.orig    Tue Jan  2 18:27:55 2007
-+++ common.mak Tue Jan  2 18:28:19 2007
-@@ -63,13 +63,7 @@ install-libs: $(INSTLIBTARGETS)
+--- common.mak.orig    Wed Apr 11 10:21:45 2007
++++ common.mak Wed Apr 11 10:22:23 2007
+@@ -64,13 +64,7 @@ install-libs: $(INSTLIBTARGETS)
  
  install-lib-shared: $(SLIBNAME)
        install -d "$(shlibdir)"
--      install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
--              "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+-      install -m 755 $(SLIBNAME) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+-      $(STRIP) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
 -      cd "$(shlibdir)" && \
 -              ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
 -      cd "$(shlibdir)" && \
Index: patches/patch-libavcodec_Makefile
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-libavcodec_Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 patch-libavcodec_Makefile
--- patches/patch-libavcodec_Makefile   23 Jan 2007 09:34:45 -0000      1.13
+++ patches/patch-libavcodec_Makefile   11 Apr 2007 21:12:12 -0000
@@ -1,16 +1,15 @@
 $OpenBSD: patch-libavcodec_Makefile,v 1.13 2007/01/23 09:34:45 robert Exp $
---- libavcodec/Makefile.orig   Mon Jan  8 01:24:14 2007
-+++ libavcodec/Makefile        Mon Jan  8 13:43:41 2007
-@@ -402,11 +402,9 @@ CFLAGS += $(CFLAGS-yes)
- OBJS += $(OBJS-yes)
- ASM_OBJS += $(ASM_OBJS-yes)
+--- libavcodec/Makefile.orig   Wed Apr 11 10:16:20 2007
++++ libavcodec/Makefile        Wed Apr 11 10:16:49 2007
+@@ -401,10 +401,8 @@ ASM_OBJS-$(TARGET_ARCH_BFIN)           += bfin/pixels_
+                                           bfin/idct_bfin.o   \
+                                           bfin/fdct_bfin.o   \
  
 -EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
 -
  NAME=avcodec
- ifeq ($(BUILD_SHARED),yes)
 -LIBVERSION=$(LAVCVERSION)
 +LIBVERSION=$(LIBavcodec_VERSION)
  LIBMAJOR=$(LAVCMAJOR)
- endif
  
+ TESTS= imgresample-test fft-test dct-test
Index: patches/patch-libavcodec_dsputil_c
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-libavcodec_dsputil_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-libavcodec_dsputil_c
--- patches/patch-libavcodec_dsputil_c  23 Jan 2007 09:34:45 -0000      1.1
+++ patches/patch-libavcodec_dsputil_c  11 Apr 2007 21:45:18 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-libavcodec_dsputil_c,v 1.1 2007/01/23 09:34:45 robert Exp $
---- libavcodec/dsputil.c.orig  Mon Dec 11 17:53:55 2006
-+++ libavcodec/dsputil.c       Tue Jan  2 18:22:01 2007
-@@ -3829,7 +3829,7 @@ void dsputil_init(DSPContext* c, AVCodec
+--- libavcodec/dsputil.c.orig  Fri Mar 30 15:15:31 2007
++++ libavcodec/dsputil.c       Wed Apr 11 17:23:16 2007
+@@ -3837,7 +3837,7 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx
  {
      int i;
  
Index: patches/patch-libavcodec_h264_c
===================================================================
RCS file: patches/patch-libavcodec_h264_c
diff -N patches/patch-libavcodec_h264_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-libavcodec_h264_c     11 Apr 2007 21:45:12 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- libavcodec/h264.c.orig     Wed Apr 11 17:39:34 2007
++++ libavcodec/h264.c  Wed Apr 11 17:41:34 2007
+@@ -8059,7 +8059,8 @@ static int h264_parse(AVCodecParserContext *s,
+             return buf_size;
+         }
+ 
+-        if(next<0){
++        if(next<0 && next != END_NOT_FOUND){
++            assert(pc->last_index + next >= 0 );
+             find_frame_end(h, &pc->buffer[pc->last_index + next], -next); 
//update state
+         }
+     }
+@@ -8147,9 +8148,9 @@ static int decode_nal_units(H264Context *h, uint8_t *b
+         if (ptr==NULL || dst_length <= 0){
+             return -1;
+         }
+-        while(ptr[dst_length - 1] == 0 && dst_length > 1)
++        while(ptr[dst_length - 1] == 0 && dst_length > 0)
+             dst_length--;
+-        bit_length= 8*dst_length - decode_rbsp_trailing(h, ptr + dst_length - 
1);
++        bit_length= !dst_length ? 0 : (8*dst_length - decode_rbsp_trailing(h, 
ptr + dst_length - 1));
+ 
+         if(s->avctx->debug&FF_DEBUG_STARTCODE){
+             av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d/%d length %d\n", 
h->nal_unit_type, buf_index, buf_size, dst_length);
Index: patches/patch-libavcodec_mpegvideo_c
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-libavcodec_mpegvideo_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-libavcodec_mpegvideo_c
--- patches/patch-libavcodec_mpegvideo_c        23 Jan 2007 09:34:45 -0000      
1.1
+++ patches/patch-libavcodec_mpegvideo_c        11 Apr 2007 21:45:11 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-libavcodec_mpegvideo_c,v 1.1 2007/01/23 09:34:45 robert Exp $
---- libavcodec/mpegvideo.c.orig        Sat Dec 23 05:05:36 2006
-+++ libavcodec/mpegvideo.c     Tue Jan  2 18:22:01 2007
-@@ -4837,7 +4837,7 @@ static int pre_estimate_motion_thread(AV
+--- libavcodec/mpegvideo.c.orig        Wed Mar 14 09:19:19 2007
++++ libavcodec/mpegvideo.c     Wed Apr 11 17:23:16 2007
+@@ -4840,7 +4840,7 @@ static int pre_estimate_motion_thread(AVCodecContext *
  static int estimate_motion_thread(AVCodecContext *c, void *arg){
      MpegEncContext *s= arg;
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-libavcodec_mpegvideo_c,v
  
      s->me.dia_size= s->avctx->dia_size;
      s->first_slice_line=1;
-@@ -4865,7 +4865,7 @@ static int mb_var_thread(AVCodecContext 
+@@ -4868,7 +4868,7 @@ static int mb_var_thread(AVCodecContext *c, void *arg)
      MpegEncContext *s= arg;
      int mb_x, mb_y;
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-libavcodec_mpegvideo_c,v
  
      for(mb_y=s->start_mb_y; mb_y < s->end_mb_y; mb_y++) {
          for(mb_x=0; mb_x < s->mb_width; mb_x++) {
-@@ -4914,7 +4914,7 @@ static int encode_thread(AVCodecContext 
+@@ -4917,7 +4917,7 @@ static int encode_thread(AVCodecContext *c, void *arg)
      PutBitContext pb[2], pb2[2], tex_pb[2];
  //printf("%d->%d\n", s->resync_mb_y, s->end_mb_y);
  
Index: patches/patch-libavcodec_vc1_c
===================================================================
RCS file: patches/patch-libavcodec_vc1_c
diff -N patches/patch-libavcodec_vc1_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-libavcodec_vc1_c      11 Apr 2007 21:45:12 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- libavcodec/vc1.c.orig      Wed Apr 11 17:41:48 2007
++++ libavcodec/vc1.c   Wed Apr 11 17:45:02 2007
+@@ -2318,6 +2318,7 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dm
+         off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2;
+         B = s->current_picture.motion_val[0][xy - wrap*2 + off];
+ 
++        if(!s->mb_x) C[0] = C[1] = 0;
+         if(!s->first_slice_line) { // predictor A is not out of bounds
+             if(s->mb_width == 1) {
+                 px = A[0];
+@@ -2395,6 +2396,7 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dm
+         off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2;
+         B = s->current_picture.motion_val[1][xy - wrap*2 + off];
+ 
++        if(!s->mb_x) C[0] = C[1] = 0;
+         if(!s->first_slice_line) { // predictor A is not out of bounds
+             if(s->mb_width == 1) {
+                 px = A[0];
Index: patches/patch-libavformat_Makefile
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-libavformat_Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 patch-libavformat_Makefile
--- patches/patch-libavformat_Makefile  23 Jan 2007 09:34:45 -0000      1.12
+++ patches/patch-libavformat_Makefile  11 Apr 2007 21:12:12 -0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-libavformat_Makefile,v 1.12 2007/01/23 09:34:45 robert Exp $
---- libavformat/Makefile.orig  Sun Dec 24 06:51:43 2006
-+++ libavformat/Makefile       Tue Jan  2 18:22:01 2007
-@@ -195,7 +195,7 @@ OBJS += $(OBJS-yes)
+--- libavformat/Makefile.orig  Wed Apr 11 10:27:57 2007
++++ libavformat/Makefile       Wed Apr 11 10:28:38 2007
+@@ -160,7 +160,7 @@ OBJS-$(CONFIG_NETWORK)                   += udp.o tcp.
+                                             rtpproto.o mpegts.o rtp_h264.o
  
  NAME=avformat
- ifeq ($(BUILD_SHARED),yes)
 -LIBVERSION=$(LAVFVERSION)
 +LIBVERSION=$(LIBavformat_VERSION)
  LIBMAJOR=$(LAVFMAJOR)
- endif
  
+ include ../common.mak
Index: patches/patch-libavformat_utils_c
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-libavformat_utils_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-libavformat_utils_c
--- patches/patch-libavformat_utils_c   23 Jan 2007 09:34:45 -0000      1.1
+++ patches/patch-libavformat_utils_c   11 Apr 2007 21:12:12 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-libavformat_utils_c,v 1.1 2007/01/23 09:34:45 robert Exp $
---- libavformat/utils.c.orig   Mon Jan  8 16:44:13 2007
-+++ libavformat/utils.c        Wed Jan 10 14:38:27 2007
-@@ -1781,7 +1781,7 @@ int av_find_stream_info(AVFormatContext 
-     AVPacketList *pktl=NULL, **ppktl;
-     int64_t last_dts[MAX_STREAMS];
-     int duration_count[MAX_STREAMS]={0};
--    double duration_error[MAX_STREAMS][MAX_STD_TIMEBASES]={{0}}; //FIXME 
malloc()?
-+    double (*duration_error)[MAX_STD_TIMEBASES] = av_mallocz(MAX_STREAMS * 
sizeof(*duration_error));
- 
-     for(i=0;i<ic->nb_streams;i++) {
-         st = ic->streams[i];
-@@ -1893,7 +1893,7 @@ int av_find_stream_info(AVFormatContext 
- //                if(st->codec->codec_type == CODEC_TYPE_VIDEO)
- //                    av_log(NULL, AV_LOG_ERROR, "%f\n", dur);
-                 if(duration_count[index] < 2)
--                    memset(duration_error, 0, sizeof(duration_error));
-+                    memset(duration_error, 0, MAX_STREAMS * 
sizeof(*duration_error));
-                 for(i=1; i<MAX_STD_TIMEBASES; i++){
-                     int framerate= get_std_framerate(i);
-                     int ticks= lrintf(dur*framerate/(1001*12));
-@@ -2013,6 +2013,9 @@ int av_find_stream_info(AVFormatContext 
-         }
-     }
- #endif
-+
-+    av_freep(&duration_error);
-+
-     return ret;
- }
- 
Index: patches/patch-libavutil_Makefile
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-libavutil_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-libavutil_Makefile
--- patches/patch-libavutil_Makefile    23 Jan 2007 09:34:45 -0000      1.2
+++ patches/patch-libavutil_Makefile    11 Apr 2007 21:12:12 -0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-libavutil_Makefile,v 1.2 2007/01/23 09:34:45 robert Exp $
---- libavutil/Makefile.orig    Tue Nov 14 03:02:30 2006
-+++ libavutil/Makefile Mon Dec 11 14:01:08 2006
-@@ -22,7 +22,7 @@ HEADERS = avutil.h common.h mathematics.
+--- libavutil/Makefile.orig    Wed Apr 11 10:15:07 2007
++++ libavutil/Makefile Wed Apr 11 10:15:42 2007
+@@ -21,7 +21,7 @@ HEADERS = avutil.h common.h mathematics.h integer.h ra
+           random.h mem.h base64.h
  
  NAME=avutil
- ifeq ($(BUILD_SHARED),yes)
 -LIBVERSION=$(LAVUVERSION)
 +LIBVERSION=$(LIBavutil_VERSION)
  LIBMAJOR=$(LAVUMAJOR)
- endif
  
+ include ../common.mak
Index: patches/patch-libpostproc_Makefile
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-libpostproc_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-libpostproc_Makefile
--- patches/patch-libpostproc_Makefile  23 Jan 2007 09:34:45 -0000      1.1
+++ patches/patch-libpostproc_Makefile  11 Apr 2007 21:12:12 -0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-libpostproc_Makefile,v 1.1 2007/01/23 09:34:45 robert Exp $
---- libpostproc/Makefile.orig  Mon Dec  4 14:38:30 2006
-+++ libpostproc/Makefile       Mon Dec  4 14:38:48 2006
-@@ -8,7 +8,7 @@ EXTRALIBS := -L$(BUILD_ROOT)/libavutil -
+--- libpostproc/Makefile.orig  Wed Apr 11 10:17:05 2007
++++ libpostproc/Makefile       Wed Apr 11 10:17:14 2007
+@@ -7,7 +7,7 @@ incdir=$(prefix)/include/postproc
+ EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
  
  NAME=postproc
- ifeq ($(BUILD_SHARED),yes)
 -LIBVERSION=$(SPPVERSION)
 +LIBVERSION=$(LIBpostproc_VERSION)
  LIBMAJOR=$(SPPMAJOR)
- endif
  
+ STATIC_OBJS=postprocess.o
Index: patches/patch-libswscale_Makefile
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-libswscale_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-libswscale_Makefile
--- patches/patch-libswscale_Makefile   23 Jan 2007 09:34:45 -0000      1.1
+++ patches/patch-libswscale_Makefile   11 Apr 2007 21:12:12 -0000
@@ -1,16 +1,15 @@
 $OpenBSD: patch-libswscale_Makefile,v 1.1 2007/01/23 09:34:45 robert Exp $
---- libswscale/Makefile.orig   Tue Jan  2 19:01:04 2007
-+++ libswscale/Makefile        Tue Jan  2 19:02:35 2007
-@@ -3,11 +3,9 @@ include ../config.mak
+--- libswscale/Makefile.orig   Wed Apr 11 10:20:59 2007
++++ libswscale/Makefile        Wed Apr 11 10:21:23 2007
+@@ -2,10 +2,8 @@
+ include ../config.mak
  
  NAME=swscale
- ifeq ($(BUILD_SHARED),yes)
 -LIBVERSION=$(SWSVERSION)
 +LIBVERSION=$(LIBswscale_VERSION)
  LIBMAJOR=$(SWSMAJOR)
- endif
 -
 -EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
  
  OBJS= swscale.o rgb2rgb.o
- ifeq ($(TARGET_ALTIVEC),yes)
+ 
Index: patches/patch-tests_regression_sh
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/patches/patch-tests_regression_sh,v
retrieving revision 1.1
diff -u -p -r1.1 patch-tests_regression_sh
--- patches/patch-tests_regression_sh   23 Jan 2007 09:34:45 -0000      1.1
+++ patches/patch-tests_regression_sh   11 Apr 2007 21:45:13 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-tests_regression_sh,v 1.1 2007/01/23 09:34:45 robert Exp $
---- tests/regression.sh.orig   Sat Dec  2 17:03:28 2006
-+++ tests/regression.sh        Sat Dec  9 20:16:17 2006
-@@ -89,7 +89,7 @@ fi
+--- tests/regression.sh.orig   Fri Apr  6 19:16:08 2007
++++ tests/regression.sh        Wed Apr 11 17:23:16 2007
+@@ -91,7 +91,7 @@ fi
  
  
  # various files
@@ -10,7 +10,7 @@ $OpenBSD: patch-tests_regression_sh,v 1.
  tiny_psnr="./tiny_psnr"
  reffile="$2"
  benchfile="$datadir/ffmpeg.bench"
-@@ -103,6 +103,8 @@ if [ X"`echo | md5sum 2> /dev/null`" != 
+@@ -107,6 +107,8 @@ if [ X"`echo | md5sum 2> /dev/null`" != X ]; then
      do_md5sum() { md5sum -b $1; }
  elif [ -x /sbin/md5 ]; then
      do_md5sum() { /sbin/md5 -r $1 | sed 's# \**\./# *./#'; }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST   2 Mar 2007 23:38:28 -0000       1.11
+++ pkg/PLIST   11 Apr 2007 21:12:12 -0000
@@ -9,14 +9,18 @@ include/ffmpeg/avcodec.h
 include/ffmpeg/avformat.h
 include/ffmpeg/avio.h
 include/ffmpeg/avutil.h
+include/ffmpeg/base64.h
 include/ffmpeg/common.h
 include/ffmpeg/fifo.h
 include/ffmpeg/integer.h
 include/ffmpeg/intfloat_readwrite.h
 include/ffmpeg/log.h
+include/ffmpeg/lzo.h
 include/ffmpeg/mathematics.h
 include/ffmpeg/md5.h
+include/ffmpeg/mem.h
 include/ffmpeg/opt.h
+include/ffmpeg/random.h
 include/ffmpeg/rational.h
 include/ffmpeg/rgb2rgb.h
 include/ffmpeg/rtp.h

Reply via email to