aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2011-05-06 11:06:58 +0200
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2011-05-07 12:03:58 +0200
commit70c24b2171f5004821e522048c75dd3c57b7d233 (patch)
tree44a7fa28c62a576d48bedb8bdb125025d1c7d006
parentf5a669c229425cdac828c230addf10d6d9cbe3a7 (diff)
downloadffmpeg-70c24b2171f5004821e522048c75dd3c57b7d233.tar.gz
ffmpeg: remove useless intermediary variable resample_dst in do_video_out()
-rw-r--r--ffmpeg.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index d074489763..d8997e2207 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1147,7 +1147,7 @@ static void do_video_out(AVFormatContext *s,
int *frame_size)
{
int nb_frames, i, ret, resample_changed;
- AVFrame *final_picture, *formatted_picture, *resampling_dst;
+ AVFrame *final_picture, *formatted_picture;
AVCodecContext *enc, *dec;
double sync_ipts;
@@ -1192,7 +1192,6 @@ static void do_video_out(AVFormatContext *s,
formatted_picture = in_picture;
final_picture = formatted_picture;
- resampling_dst = &ost->pict_tmp;
resample_changed = ost->resample_width != dec->width ||
ost->resample_height != dec->height ||
@@ -1243,7 +1242,7 @@ static void do_video_out(AVFormatContext *s,
}
}
sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize,
- 0, ost->resample_height, resampling_dst->data, resampling_dst->linesize);
+ 0, ost->resample_height, ost->pict_tmp.data, ost->pict_tmp.linesize);
}
#endif