diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-07-19 14:48:13 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-07-19 14:48:13 +0000 |
| commit | d0f596b4efccb1388ed7dea971a9f8b8cabc39c4 (patch) | |
| tree | ed07c3f696ce09ec0371382c91659f677c54ba2f | |
| parent | d72e7d0f24f1331c536f0d4aa41aaefceb41d921 (diff) | |
| download | ffmpeg-d0f596b4efccb1388ed7dea971a9f8b8cabc39c4.tar.gz | |
Make video hook infrastructure conditional on video hooks being enabled.
Originally committed as revision 9757 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | ffmpeg.c | 5 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -607,6 +607,7 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void 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 *arg) 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 *arg) 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", "" }, diff --git a/libavformat/Makefile b/libavformat/Makefile index 4aeac8bdcb..bd1a234c9c 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -155,7 +155,7 @@ OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o 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) |