diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/combined/ffmpeg/Makefile.am | 3 | ||||
| -rwxr-xr-x | src/combined/ffmpeg/mkcodeclist.pl | 4 |
2 files changed, 4 insertions, 3 deletions
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 $!; |