FFmpeg commit logs

Carl Eugen Hoyos | 1 Sep 2011 19:04

Fix compilation with --disable-avfilter.

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
 <at>  <at>  -1078,9 +1078,10  <at>  <at>  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;
 <at>  <at>  -2320,6 +2321,7  <at>  <at>  static int transcode(OutputFile *output_files,

(Continue reading)

headers

Carl Eugen Hoyos | 7 Sep 2011 15:16

Fix compilation with --disable-avfilter.

ffmpeg | branch: release/0.7 | Carl Eugen Hoyos <cehoyos <at> ag.or.at> | Tue Aug 16 23:31:09 2011 +0200|
[6a57021cf96dc548b6cc2c97dedb8958225d58e3] | committer: Carl Eugen Hoyos

Fix compilation with --disable-avfilter.
(cherry picked from commit 67a8251690a17f05630eb6f45a73db0f0e806c72)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6a57021cf96dc548b6cc2c97dedb8958225d58e3
---

 ffplay.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index 8788771..6eefee6 100644
--- a/ffplay.c
+++ b/ffplay.c
 <at>  <at>  -1779,8 +1779,10  <at>  <at>  static int video_thread(void *arg)

         if (ret < 0) goto the_end;

+#if CONFIG_AVFILTER
         if (!picref)
             continue;
+#endif

         pts = pts_int*av_q2d(is->video_st->time_base);