From: Torsten J. <t....@gm...> - 2013-04-11 17:36:35
|
# HG changeset patch # User Torsten Jager <t....@gm...> # Date 1365701594 -10800 # Node ID f9bdfffca356c99e0461508b133fe50b482e89cb # Branch default # Parent f132f612296e345d3e8db8fbe1550df6c89848ed ff decoder: use AV_CODEC_ID_* where available diff --git a/src/combined/ffmpeg/ffmpeg_decoder.h b/src/combined/ffmpeg/ffmpeg_decoder.h --- a/src/combined/ffmpeg/ffmpeg_decoder.h +++ b/src/combined/ffmpeg/ffmpeg_decoder.h @@ -36,7 +36,11 @@ typedef struct ff_codec_s { uint32_t type; +#if defined LIBAVCODEC_VERSION_INT && LIBAVCODEC_VERSION_INT >= ((54<<16)|(25<<8)) + enum AVCodecID id; +#else enum CodecID id; +#endif const char *name; } ff_codec_t; --git a/src/combined/ffmpeg/mkcodeclist.pl b/src/combined/ffmpeg/mkcodeclist.pl --- a/src/combined/ffmpeg/mkcodeclist.pl +++ b/src/combined/ffmpeg/mkcodeclist.pl @@ -13,9 +13,13 @@ my %codecs; open LIST, "< $ffmpeg" or die $!; $line = <LIST>; +my $ff_prefix = 'CODEC_ID_'; +if (substr ($line, 0, 12) eq 'AV_CODEC_ID_') { + $ff_prefix = 'AV_CODEC_ID_'; +} while (defined $line) { chomp $line; - $line =~ s/^CODEC_ID_//o; + $line =~ s/^$ff_prefix//o; $codecs{$line} = 0; $line = <LIST>; } @@ -68,7 +72,7 @@ foreach $line (@known) { next if $line->[0] eq '!'; next unless defined $codecs{$line->[1]}; - print LIST " { BUF_${Type}_$line->[0], CODEC_ID_$line->[1], \"$line->[2] (ffmpeg)\" },\n" or die $!; + print LIST " { BUF_${Type}_$line->[0], $ff_prefix$line->[1], \"$line->[2] (ffmpeg)\" },\n" or die $!; } print LIST "};\n\nstatic uint32_t supported_${type}_types[] = {\n" or die $!; foreach $line (@known) { |