[MPlayer-cvslog] r37867 - trunk/configure

[rtogni]

Author: rtogni
Date: Fri May 13 22:40:50 2016
New Revision: 37867

Log:
Generate bsf_list and protcol list for ffmpeg in configure

 - FFmpeg now creates the list of enabled protocols and bitstream filters at
configure time; do the same in MPlayer.
 - Fix generation of the list of available bsf, they are now listed into
bitstream_filers.c instead of allcodecs.c

This fixes compilation with latest ffmpeg

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Wed May 11 21:40:43 2016	(r37866)
+++ trunk/configure	Fri May 13 22:40:50 2016	(r37867)
@@ -1554,7 +1554,6 @@ echocheck "ffmpeg/libavcodec/allcodecs.c
 libavdecoders_all=$(list_subparts  DEC      decoder  codec/allcodecs.c)
 libavencoders_all=$(list_subparts  ENC      encoder  codec/allcodecs.c)
 libavparsers_all=$(list_subparts   PARSER   parser   codec/allcodecs.c)
-libavbsfs_all=$(list_subparts      BSF      bsf      codec/allcodecs.c)
 libavhwaccels_all=$(list_subparts  HWACCEL  hwaccel  codec/allcodecs.c)
 test $? -eq 0 && _list_subparts=found || _list_subparts="not found"
 echores "$_list_subparts"
@@ -1565,6 +1564,11 @@ libavmuxers_all=$(list_subparts    _MUX
 test $? -eq 0 && _list_subparts=found || _list_subparts="not found"
 echores "$_list_subparts"
 
+echocheck "ffmpeg/libavcodec/bitsteram_filters.c"
+libavbsfs_all=$(list_subparts_extern AVBitStreamFilter bsf codec/bitstream_filters.c)
+test $? -eq 0 && _list_subparts_extern=found || _list_subparts_extern="not found"
+echores "$_list_subparts_extern"
+
 echocheck "ffmpeg/libavformat/protocols.c"
 libavprotocols_all=$(list_subparts_extern URLProtocol protocol format/protocols.c)
 test $? -eq 0 && _list_subparts_extern=found || _list_subparts_extern="not found"
@@ -1624,6 +1628,24 @@ for ac_option do
   esac
 done
 
+# generate the lists of enabled components for ffmpeg
+print_enabled_components(){
+    file=$1
+    struct_name=$2
+    name=$3
+    shift 3
+    list=$(echo $* | tolower)
+    echo "static const $struct_name *$name[] = {" > $TMPH
+    for c in $list; do
+        printf "    &ff_%s,\n" $c >> $TMPH
+    done
+    echo "    NULL };" >> $TMPH
+    cmp -s $TMPH ffmpeg/$file && return
+    cp $TMPH ffmpeg/$file
+}
+
+print_enabled_components libavcodec/bsf_list.c AVBitStreamFilter bitstream_filters $libavbsfs
+print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $libavprotocols
 
 # Checking CC version...
 # Intel C++ Compilers (no autoselect, use CC=/some/binary ./configure)