summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-09-01 02:27:38 +0200
committerClément Bœsch <ubitux@gmail.com>2011-09-01 20:23:40 +0200
commitdf8737eb354af4e48d53c7b848ca8da9e2182929 (patch)
tree5c82905b2ba01a5902269f35340d1e0a80e81efc /ffmpeg.c
parentb85e9d3104584bf925c368f767190f6a216ffebd (diff)
ffmpeg: fix two unused variables warnings.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index e3ba057ac6..3104d6e106 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1077,15 +1077,16 @@ static void do_video_resample(OutputStream *ost,
AVFrame *in_picture,
AVFrame **out_picture)
{
- int resample_changed = 0;
+#if CONFIG_AVFILTER
*out_picture = in_picture;
-#if !CONFIG_AVFILTER
+#else
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;
+ int resample_changed = ost->resample_width != dec->width ||
+ ost->resample_height != dec->height ||
+ ost->resample_pix_fmt != dec->pix_fmt;
+ *out_picture = in_picture;
if (resample_changed) {
av_log(NULL, AV_LOG_INFO,
"Input stream #%d.%d frame changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s\n",
@@ -1884,7 +1885,6 @@ static void print_sdp(OutputFile *output_files, int n)
static int init_input_stream(int ist_index, OutputStream *output_streams, int nb_output_streams,
char *error, int error_len)
{
- int i;
InputStream *ist = &input_streams[ist_index];
if (ist->decoding_needed) {
AVCodec *codec = ist->dec;