virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

ffmpeg: move resample_changed check within the #if !CONFIG_AVFILTER

Browse Source 
The check and the corresponding message in do_video_out() are
unnecessary in the libavfilter path, as a similar check and message
are performed within the buffer source.
This commit is contained in:
Stefano Sabatini 2011-05-06 11:10:02 +02:00
parent 70c24b2171
commit a851fa7fec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg.c
View File

@ -1146,7 +1146,7 @@ static void do_video_out(AVFormatContext *s,
AVFrame *in_picture, AVFrame *in_picture,
int *frame_size) int *frame_size)
{ {
int nb_frames, i, ret, resample_changed; int nb_frames, i, ret, av_unused resample_changed;
AVFrame *final_picture, *formatted_picture; AVFrame *final_picture, *formatted_picture;
AVCodecContext *enc, *dec; AVCodecContext *enc, *dec;
double sync_ipts; double sync_ipts;
@ -1193,6 +1193,7 @@ static void do_video_out(AVFormatContext *s,
formatted_picture = in_picture; formatted_picture = in_picture;
final_picture = formatted_picture; final_picture = formatted_picture;
#if !CONFIG_AVFILTER
resample_changed = ost->resample_width != dec->width || resample_changed = ost->resample_width != dec->width ||
ost->resample_height != dec->height || ost->resample_height != dec->height ||
ost->resample_pix_fmt != dec->pix_fmt; ost->resample_pix_fmt != dec->pix_fmt;
@ -1208,7 +1209,6 @@ static void do_video_out(AVFormatContext *s,
ost->resample_pix_fmt = dec->pix_fmt; ost->resample_pix_fmt = dec->pix_fmt;
} }
#if !CONFIG_AVFILTER
ost->video_resample = dec->width != enc->width || ost->video_resample = dec->width != enc->width ||
dec->height != enc->height || dec->height != enc->height ||
dec->pix_fmt != enc->pix_fmt; dec->pix_fmt != enc->pix_fmt;