vlc/vlc-2.0 | branch: master | Rafaël Carré <[email protected]> | Tue Jan 31 23:57:27 2012 -0500| [44e8a1fb43e1fcdfedc303c3e40724aec72685aa] | committer: Rafaël Carré
libav*: remove broken use of log callback We can only use it at application level Just use the default libav* callback instead which prints to stderr We might want to set libav* verbosity with av_log_set_level() (cherry picked from commit 20155f800ecee139e81babf82b031cc5a8bbb045) Signed-off-by: Rafaël Carré <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=44e8a1fb43e1fcdfedc303c3e40724aec72685aa --- modules/codec/avcodec/Modules.am | 1 - modules/codec/avcodec/avcodec.c | 2 - modules/codec/avcodec/avutil.h | 60 -------------------------------------- modules/demux/avformat/mux.c | 3 -- po/POTFILES.in | 1 - 5 files changed, 0 insertions(+), 67 deletions(-) diff --git a/modules/codec/avcodec/Modules.am b/modules/codec/avcodec/Modules.am index 2dee687..33bf7da 100644 --- a/modules/codec/avcodec/Modules.am +++ b/modules/codec/avcodec/Modules.am @@ -5,7 +5,6 @@ libavcodec_plugin_la_SOURCES = \ subtitle.c \ audio.c \ deinterlace.c \ - avutil.h \ fourcc.c \ chroma.h \ chroma.c \ diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c index c9f9b1e..072e0bf 100644 --- a/modules/codec/avcodec/avcodec.c +++ b/modules/codec/avcodec/avcodec.c @@ -44,7 +44,6 @@ #endif #include "avcodec.h" -#include "avutil.h" #include "chroma.h" #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 25, 0 ) @@ -399,7 +398,6 @@ void InitLibavcodec( vlc_object_t *p_object ) avcodec_init(); #endif avcodec_register_all(); - av_log_set_callback( LibavutilCallback ); b_ffmpeginit = true; msg_Dbg( p_object, "libavcodec initialized (interface 0x%x)", diff --git a/modules/codec/avcodec/avutil.h b/modules/codec/avcodec/avutil.h deleted file mode 100644 index 48a5222..0000000 --- a/modules/codec/avcodec/avutil.h +++ /dev/null @@ -1,60 +0,0 @@ -/***************************************************************************** - * avutil.h: avutil helper functions - ***************************************************************************** - * Copyright (C) 1999-2008 the VideoLAN team - * $Id$ - * - * Authors: Laurent Aimar <[email protected]> - * Gildas Bazin <[email protected]> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ - -/***************************************************************************** - * Export libavutil messages to the VLC message system - *****************************************************************************/ -static inline void LibavutilCallback( void *p_opaque, int i_level, - const char *psz_format, va_list va ) -{ - AVCodecContext *p_avctx = (AVCodecContext *)p_opaque; - const AVClass *p_avc; - - p_avc = p_avctx ? p_avctx->av_class : 0; - -#define cln p_avc->class_name - /* Make sure we can get p_this back */ - if( !p_avctx || !p_avc || !cln || - cln[0]!='A' || cln[1]!='V' || cln[2]!='C' || cln[3]!='o' || - cln[4]!='d' || cln[5]!='e' || cln[6]!='c' ) - { - if( i_level == AV_LOG_ERROR ) vfprintf( stderr, psz_format, va ); - return; - } -#undef cln - - switch( i_level ) - { - case AV_LOG_DEBUG: - case AV_LOG_INFO: - /* Print debug messages if they were requested */ - if( !p_avctx->debug ) - break; - - case AV_LOG_ERROR: - case AV_LOG_QUIET: - vfprintf( stderr, psz_format, va ); - break; - } -} diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c index a3dc29a..1d6c6a4 100644 --- a/modules/demux/avformat/mux.c +++ b/modules/demux/avformat/mux.c @@ -37,7 +37,6 @@ #include "avformat.h" #include "../../codec/avcodec/avcodec.h" -#include "../../codec/avcodec/avutil.h" /* Support for deprecated APIs */ #if LIBAVFORMAT_VERSION_INT < ((52<<16)+(105<<8)+0) @@ -94,7 +93,6 @@ int OpenMux( vlc_object_t *p_this ) /* Should we call it only once ? */ av_register_all(); - av_log_set_callback( LibavutilCallback ); config_ChainParse( p_mux, "ffmpeg-", ppsz_mux_options, p_mux->p_cfg ); @@ -240,7 +238,6 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) } codec = stream->codec; - /* This is used by LibavutilCallback (avutil.h) to print messages */ codec->opaque = p_mux; switch( p_input->p_fmt->i_cat ) diff --git a/po/POTFILES.in b/po/POTFILES.in index f5784e0..ab3ce36 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -350,7 +350,6 @@ modules/codec/araw.c modules/codec/avcodec/audio.c modules/codec/avcodec/avcodec.c modules/codec/avcodec/avcodec.h -modules/codec/avcodec/avutil.h modules/codec/avcodec/chroma.c modules/codec/avcodec/deinterlace.c modules/codec/avcodec/encoder.c _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
