diff options
Diffstat (limited to 'av_log.c')
| -rw-r--r-- | av_log.c | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -29,12 +29,10 @@ #include <libavutil/avutil.h> #include <libavutil/log.h> -#ifdef CONFIG_FFMPEG #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> #include <libswscale/swscale.h> #include <libpostproc/postprocess.h> -#endif static int av_log_level_to_mp_level(int av_level) { @@ -64,7 +62,6 @@ static int extract_msg_type_from_ctx(void *ptr) return MSGT_FIXME; } -#ifdef CONFIG_FFMPEG if (!strcmp(avc->class_name, "AVCodecContext")) { AVCodecContext *s = ptr; if (s->codec) { @@ -89,7 +86,6 @@ static int extract_msg_type_from_ctx(void *ptr) return MSGT_MUXER; return MSGT_FIXME; } -#endif return MSGT_FIXME; } @@ -115,12 +111,11 @@ static void mp_msg_av_log_callback(void *ptr, int level, const char *fmt, void init_libav(void) { av_log_set_callback(mp_msg_av_log_callback); -#ifdef CONFIG_FFMPEG + avcodec_init(); avcodec_register_all(); av_register_all(); -#endif } #define V(x) (x)>>16, (x)>>8 & 255, (x) & 255 @@ -139,10 +134,8 @@ static void print_version(char *name, unsigned buildv, unsigned runv) void print_libav_versions(void) { print_version("libavutil", LIBAVUTIL_VERSION_INT, avutil_version()); -#ifdef CONFIG_FFMPEG print_version("libavcodec", LIBAVCODEC_VERSION_INT, avcodec_version()); print_version("libavformat", LIBAVFORMAT_VERSION_INT, avformat_version()); print_version("libswscale", LIBSWSCALE_VERSION_INT, swscale_version()); print_version("libpostproc", LIBPOSTPROC_VERSION_INT, postproc_version()); -#endif } |