Mercurial > mplayer.hg

diff libmpdemux/demuxer.c @ 33871:30f5e5cd3676

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move code for setting up libav* logging callbacks from vd_ffmpeg to a separate file and also use it when only initializing libavformat.
author reimar
date Tue, 09 Aug 2011 19:57:00 +0000
parents 277ec491a8a7
children d7bc4bcc3523
line wrap: on
line diff
--- a/libmpdemux/demuxer.c	Tue Aug 09 19:23:41 2011 +0000
+++ b/libmpdemux/demuxer.c	Tue Aug 09 19:57:00 2011 +0000
@@ -44,7 +44,6 @@
 #include "libmpcodecs/dec_audio.h"
 #include "libmpcodecs/dec_video.h"
 #include "libmpcodecs/dec_teletext.h"
-#include "libmpcodecs/vd_ffmpeg.h"
 
 #ifdef CONFIG_ASS
 #include "libass/ass.h"
@@ -56,6 +55,7 @@
 #if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE
 #error MP_INPUT_BUFFER_PADDING_SIZE is too small!
 #endif
+#include "av_helpers.h"
 #endif
 
 // This is quite experimental, in particular it will mess up the pts values