Common subdirectories: mpeg_bits/bitmaps and ../bmt1r2/mpeg_bits/bitmaps
Common subdirectories: mpeg_bits/numbitmaps and ../bmt1r2/mpeg_bits/numbitmaps
Common subdirectories: mpeg_blocks/bitmaps and ../bmt1r2/mpeg_blocks/bitmaps
diff -c mpeg_encode/Makefile ../bmt1r2/mpeg_encode/Makefile
*** mpeg_encode/Makefile	Wed Aug 16 15:16:56 1995
--- ../bmt1r2/mpeg_encode/Makefile	Wed Aug 16 11:23:37 1995
***************
*** 141,149 ****
  #	this works for most machines
  LIBS = $(JPEG_LIB) -lm
  
- #	Solaris
- #LIBS = $(JPEG_LIB) -lm -lsocket -lnsl
- 
  #	Intel-based SVR4.0
  #LIBS = $(JPEG_LIB) -lm -lsocket -lnsl -lgen
  
--- 141,146 ----
Common subdirectories: mpeg_encode/convert and ../bmt1r2/mpeg_encode/convert
Common subdirectories: mpeg_encode/docs and ../bmt1r2/mpeg_encode/docs
Common subdirectories: mpeg_encode/examples and ../bmt1r2/mpeg_encode/examples
Common subdirectories: mpeg_encode/headers and ../bmt1r2/mpeg_encode/headers
Common subdirectories: mpeg_encode/jpeg and ../bmt1r2/mpeg_encode/jpeg
diff -c mpeg_encode/libpnmrw.c ../bmt1r2/mpeg_encode/libpnmrw.c
*** mpeg_encode/libpnmrw.c	Wed Aug 16 15:24:26 1995
--- ../bmt1r2/mpeg_encode/libpnmrw.c	Thu Jun 29 14:03:20 1995
***************
*** 30,38 ****
  #include <stdio.h>
  #include "libpnmrw.h"
  
! /* if don't have string.h, try strings.h */
  #include <string.h>
  #define rindex(s,c) strrchr(s,c)
  
  
  /* Definitions. */
--- 30,41 ----
  #include <stdio.h>
  #include "libpnmrw.h"
  
! #ifdef SYSV
  #include <string.h>
  #define rindex(s,c) strrchr(s,c)
+ #else /*SYSV*/
+ #include <strings.h>
+ #endif /*SYSV*/
  
  
  /* Definitions. */
diff -c mpeg_encode/param.c ../bmt1r2/mpeg_encode/param.c
*** mpeg_encode/param.c	Wed Aug 16 15:21:25 1995
--- ../bmt1r2/mpeg_encode/param.c	Mon Aug 14 15:29:32 1995
***************
*** 31,37 ****
   */
  
  /*  
!  *  $Header: /n/picasso/project/mpeg/mpeg_dist/mpeg_encode/RCS/param.c,v 1.38 1995/08/14 22:29:13 smoot Exp smoot $
   *  $Log: param.c,v $
   *  Revision 1.38  1995/08/14 22:29:13  smoot
   *  cleaned up subcommand for file name generation
--- 31,37 ----
   */
  
  /*  
!  *  $Header: /n/picasso/project/mpeg/mpeg_dist/mpeg_encode/RCS/param.c,v 1.38 1995/08/14 22:29:13 smoot Exp $
   *  $Log: param.c,v $
   *  Revision 1.38  1995/08/14 22:29:13  smoot
   *  cleaned up subcommand for file name generation
***************
*** 176,181 ****
--- 176,182 ----
  #include "fsize.h"
  #include "frames.h"
  #include "jpeg.h"
+ #include "strings.h"
  #include <string.h>
  #include <ctype.h>
  #include "rate.h"
Common subdirectories: mpeg_encode/tst and ../bmt1r2/mpeg_encode/tst
Common subdirectories: convert/mtv and ../bmt1r2/convert/mtv