[FFmpeg-cvslog] Fix compilation with --disable-avfilter.
Carl Eugen Hoyos
git at videolan.org
Thu Sep 1 19:04:52 CEST 2011
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Sep 1 19:03:39 2011 +0200| [c0e8bce349f9b76d0f1b2fc6ae1f63ebed01433b] | committer: Carl Eugen Hoyos
Fix compilation with --disable-avfilter.
Fixes ticket #425.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0e8bce349f9b76d0f1b2fc6ae1f63ebed01433b
---
ffmpeg.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 4df5482..e3ba057 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1078,9 +1078,10 @@ static void do_video_resample(OutputStream *ost,
AVFrame **out_picture)
{
int resample_changed = 0;
- AVCodecContext *dec = ist->st->codec;
*out_picture = in_picture;
#if !CONFIG_AVFILTER
+ AVCodecContext *dec = ist->st->codec;
+ AVCodecContext *enc = ost->st->codec;
resample_changed = ost->resample_width != dec->width ||
ost->resample_height != dec->height ||
ost->resample_pix_fmt != dec->pix_fmt;
@@ -2320,6 +2321,7 @@ static int transcode(OutputFile *output_files,
do_pkt_dump = 1;
av_log_set_level(AV_LOG_DEBUG);
}
+#if CONFIG_AVFILTER
if (key == 'c' || key == 'C'){
char ret[4096], target[64], cmd[256], arg[256]={0};
double ts;
@@ -2346,6 +2348,7 @@ static int transcode(OutputFile *output_files,
fprintf(stderr, "Parse error\n");
}
}
+#endif
if (key == 'd' || key == 'D'){
int debug=0;
if(key == 'D') {
More information about the ffmpeg-cvslog
mailing list