[MPlayer-cvslog] r38226 - trunk/configure

[reimar]

Author: reimar
Date: Wed Jan 20 20:35:02 2021
New Revision: 38226

Log:
configure: properly enable FFmpeg CodedBitstream parsers.

Fixes the warning described in trac #2370 though it
did not seem to affect playback for me.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Wed Jan 20 20:03:35 2021	(r38225)
+++ trunk/configure	Wed Jan 20 20:35:02 2021	(r38226)
@@ -1561,6 +1561,13 @@ list_subparts_extern() {
   return 0
 }
 
+list_cbs_extern() {
+  test ! -e ffmpeg/libav${3} && return 1
+  pattern="s/^[^#]*extern.*${1} *ff_cbs_type_\([^ ]*\);/${2}_\1/p"
+  sed -n "$pattern" ffmpeg/libav${3} | toupper
+  return 0
+}
+
 list_subparts_filters() {
   test ! -e ffmpeg/libav${1} && return 1
   pattern="s/^extern AVFilter ff_([avfsinkrc]{2,5})_([a-zA-Z0-9_]+);/\1_\2_filter/p"
@@ -1592,6 +1599,11 @@ libavbsfs_all=$(list_subparts_extern AVB
 test $? -eq 0 && _list_subparts_extern=found || _list_subparts_extern="not found"
 echores "$_list_subparts_extern"
 
+echocheck "ffmpeg/libavcodec/cbs_internal.h"
+libavcbs_all=$(list_cbs_extern CodedBitstreamType cbs codec/cbs_internal.h)
+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 +1636,7 @@ libavdecoders=$(echo $libavdecoders_all)
 libavencoders=$(echo $libavencoders_all)
 libavparsers=$(echo $libavparsers_all)
 libavbsfs=$(echo $libavbsfs_all)
+libavcbs=$(echo $libavcbs_all)
 # Disable all hardware accelerators for now.
 libavhwaccels=
 libavdemuxers=$(echo $libavdemuxers_all)
@@ -8782,12 +8795,6 @@ CONFIG_BLOCKDSP= yes
 CONFIG_BSWAPDSP= yes
 CONFIG_CABAC   = yes
 CONFIG_CBS     = yes
-CONFIG_CBS_AV1 = yes
-CONFIG_CBS_H264 = yes
-CONFIG_CBS_H265 = yes
-CONFIG_CBS_JPEG = yes
-CONFIG_CBS_MPEG2 = yes
-CONFIG_CBS_VP9 = yes
 CONFIG_CHROMAPRINT = no
 CONFIG_DCT     = yes
 CONFIG_DWT     = yes
@@ -8898,6 +8905,7 @@ $(mak_enable "$libavdemuxers_all"  "$lib
 $(mak_enable "$libavmuxers_all"    "$libavmuxers"    CONFIG)
 $(mak_enable "$libavprotocols_all" "$libavprotocols" CONFIG)
 $(mak_enable "$libavbsfs_all"      "$libavbsfs"      CONFIG)
+$(mak_enable "$libavcbs_all"       "$libavcbs"       CONFIG)
 $(mak_enable "$libavhwaccels_all"  "$libavhwaccels"  CONFIG)
 $(mak_enable "$libavfilters_all"   "$libavfilters"   CONFIG)
 EOF
@@ -9545,6 +9553,7 @@ $(ff_config_enable "$libavdemuxers_all"
 $(ff_config_enable "$libavmuxers_all"    "$libavmuxers" "#")
 $(ff_config_enable "$libavprotocols_all" "$libavprotocols" "#")
 $(ff_config_enable "$libavbsfs_all"      "$libavbsfs" "#")
+$(ff_config_enable "$libavcbs_all"       "$libavcbs" "#")
 $(ff_config_enable "$libavhwaccels_all"  "$libavhwaccels" "#")
 $(ff_config_enable "$libavfilters_all"   "$libavfilters" "#")