[FFmpeg-cvslog] r9757 - in trunk: ffmpeg.c libavformat/Makefile
diego
subversion
Thu Jul 19 16:48:14 CEST 2007
Author: diego
Date: Thu Jul 19 16:48:13 2007
New Revision: 9757
Log:
Make video hook infrastructure conditional on video hooks being enabled.
Modified:
trunk/ffmpeg.c
trunk/libavformat/Makefile
Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c (original)
+++ trunk/ffmpeg.c Thu Jul 19 16:48:13 2007
@@ -607,6 +607,7 @@ static void pre_process_video_frame(AVIn
picture2 = picture;
}
+ if (ENABLE_VHOOK)
frame_hook_process(picture2, dec->pix_fmt, dec->width, dec->height,
1000000 * ist->pts / AV_TIME_BASE);
@@ -2395,6 +2396,7 @@ static void opt_video_tag(const char *ar
video_codec_tag= arg[0] + (arg[1]<<8) + (arg[2]<<16) + (arg[3]<<24);
}
+#ifdef CONFIG_VHOOK
static void add_frame_hooker(const char *arg)
{
int argc = 0;
@@ -2415,6 +2417,7 @@ static void add_frame_hooker(const char
exit(1);
}
}
+#endif
static void opt_video_codec(const char *arg)
{
@@ -3603,7 +3606,9 @@ const OptionDef options[] = {
{ "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" },
{ "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" },
{ "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" },
+#ifdef CONFIG_VHOOK
{ "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" },
+#endif
{ "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" },
{ "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" },
{ "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" },
Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile (original)
+++ trunk/libavformat/Makefile Thu Jul 19 16:48:13 2007
@@ -155,7 +155,7 @@ OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER)
OBJS-$(CONFIG_LIBNUT_DEMUXER) += libnut.o riff.o
OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o
-OBJS+= framehook.o
+OBJS-$(CONFIG_VHOOK) += framehook.o
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
-lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
More information about the ffmpeg-cvslog
mailing list