Merge from 1.2 tip.

--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c

1 files changed, 1 insertions, 0 deletions

diff --git a/include/xine/plugin_catalog.h b/include/xine/plugin_catalog.h
index be02c3649..bacdfa56c 100644
--- a/include/xine/plugin_catalog.h
+++ b/include/xine/plugin_catalog.h
@@ -45,6 +45,7 @@ typedef struct {
   plugin_file_t   *file;
   plugin_info_t   *info;
   void            *plugin_class;
+  xine_list_t     *config_entry_list;
   int              ref;          /* count intances of plugins */
   int              priority;
 } plugin_node_t ;