[vlc-commits] avio: avformat.h / avio.h are always present

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Aug 15 16:54:06 2013 +0200| [5fb9ef328456f4f5109bf71bad64666a9d0a043e] | committer: Rafaël Carré

avio: avformat.h / avio.h are always present

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

 modules/access/avio.h |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/modules/access/avio.h b/modules/access/avio.h
index 01a864a..ae95bee 100644
--- a/modules/access/avio.h
+++ b/modules/access/avio.h
@@ -21,15 +21,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-/* ffmpeg header */
-#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
-#   include <libavformat/avformat.h>
-#   if defined(HAVE_LIBAVFORMAT_AVIO_H)
-#      include <libavformat/avio.h>
-#   endif
-#elif defined(HAVE_FFMPEG_AVFORMAT_H)
-#   include <ffmpeg/avformat.h>
-#endif
+#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
+
 int  OpenAvio (vlc_object_t *);
 void CloseAvio(vlc_object_t *);
 int  OutOpenAvio (vlc_object_t *);