Fix a build failure on *BSD due to some rather useful GNUisms.

Their sed doesn't have \s and their tail doesn't handle -ve line counts.

3 files changed, 5 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b3e8baaf2..efc81a544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 xine-lib (1.1.17) 2009-??-??
   * Enable libmpeg2new. This is not yet production code; the old mpeg2
     decoder remains the default.
+  * Fix a build failure on *BSD due to some rather useful GNUisms.
 
 xine-lib (1.1.16.2) 2009-02-10
   * Build fixes related to ImageMagick 6.4 & later.
diff --git a/src/combined/ffmpeg/Makefile.am b/src/combined/ffmpeg/Makefile.am
index daae18509..24cab7577 100644
--- a/src/combined/ffmpeg/Makefile.am
+++ b/src/combined/ffmpeg/Makefile.am
@@ -64,8 +64,7 @@ avcodec_video.list: AV_CODECS:=/CODEC_ID_MPEG1VIDEO/,/CODEC_ID_PCM_S16LE/
 
 avcodec_audio.list avcodec_video.list:
 	echo '#include "$(srcdir)/ffmpeg_decoder.h"' | $(AV_CPP) - |\
-	  sed -e $(AV_CODECS)'! d; s/^\s*//; s/[=,].*//; /^$$/ d' |\
-	  head -n -1 >$@
+	  sed -e $(AV_CODECS)'! d; s/^[ \t]*//; s/[=,].*//; /^$$/ d' >$@
 
 # Generate the mappings. These are #included where needed.
 ff_%_list.h: $(srcdir)/mkcodeclist.pl avcodec_%.list $(srcdir)/xine_%.list
diff --git a/src/combined/ffmpeg/mkcodeclist.pl b/src/combined/ffmpeg/mkcodeclist.pl
index c4070eb32..b4a10921a 100755
--- a/src/combined/ffmpeg/mkcodeclist.pl
+++ b/src/combined/ffmpeg/mkcodeclist.pl
@@ -12,10 +12,12 @@ my $line;
 # Read in the ffmpeg codec IDs
 my %codecs;
 open LIST, "< $ffmpeg" or die $!;
-while (defined ($line = <LIST>)) {
+$line = <LIST>;
+while (defined $line) {
   chomp $line;
   $line =~ s/^CODEC_ID_//o;
   $codecs{$line} = 0;
+  $line = <LIST>;
 }
 close LIST or die $!;