Mercurial > mplayer.hg

changeset 35162:69b82f839935

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compiling demux_ogg against tremor, current tremor versions no longer include their own copy of the Ogg code.
author reimar
date Sun, 21 Oct 2012 10:03:41 +0000
parents 86790eb037fa
children 5e11b54c9212
files libmpdemux/demux_ogg.c
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_ogg.c	Sat Oct 20 07:13:46 2012 +0000
+++ b/libmpdemux/demux_ogg.c	Sun Oct 21 10:03:41 2012 +0000
@@ -40,11 +40,10 @@
 #define FOURCC_SPEEX  mmioFOURCC('s', 'p', 'x', ' ')
 #define FOURCC_THEORA mmioFOURCC('t', 'h', 'e', 'o')
 
+#include <ogg/ogg.h>
 #ifdef CONFIG_TREMOR
-#include <tremor/ogg.h>
 #include <tremor/ivorbiscodec.h>
 #else
-#include <ogg/ogg.h>
 #include <vorbis/codec.h>
 #endif