[vlc-devel] commit: Fix avio with MERGE_FFMPEG (Pierre Ynard )

[git version control]

vlc | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Sun Dec 13 19:48:43 2009 +0100| [7c18ac7324764571bae85d64d2ce23586e6bdf1b] | committer: Pierre Ynard 

Fix avio with MERGE_FFMPEG

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7c18ac7324764571bae85d64d2ce23586e6bdf1b
---

 modules/access/avio.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/modules/access/avio.c b/modules/access/avio.c
index fb2aad8..e75cbb9 100644
--- a/modules/access/avio.c
+++ b/modules/access/avio.c
@@ -36,9 +36,11 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
+#ifndef MERGE_FFMPEG
 vlc_module_begin()
     AVIO_MODULE
 vlc_module_end()
+#endif
 
 /*****************************************************************************
  * Local prototypes