diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-02-17 02:13:48 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-02-17 02:13:48 +0000 |
| commit | b4eea697942773917c2b4c8b932e246227ba01d4 (patch) | |
| tree | edf23a85851f62c37af20d3d2ed2ddbae73f42a2 /src/combined | |
| parent | c86104fa7a18ef14551249901ef9ade96ae46998 (diff) | |
| parent | e554df7addfea632ef9ae4be09049f459710bbe6 (diff) | |
| download | xine-lib-b4eea697942773917c2b4c8b932e246227ba01d4.tar.gz xine-lib-b4eea697942773917c2b4c8b932e246227ba01d4.tar.bz2 | |
Merge from 1.1.
--HG--
rename : doc/faq/faq.sgml => doc/faq/faq.docbook
rename : doc/hackersguide/intro.sgml => doc/hackersguide/intro.docbook
Diffstat (limited to 'src/combined')
| -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 536f4d7f6..ef19cf797 100644 --- a/src/combined/ffmpeg/Makefile.am +++ b/src/combined/ffmpeg/Makefile.am @@ -36,8 +36,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 10901552a..311d147af 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 $!; |