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.
... | ... |
@@ -1146,7 +1146,7 @@ static void do_video_out(AVFormatContext *s, |
1146 | 1146 |
AVFrame *in_picture, |
1147 | 1147 |
int *frame_size) |
1148 | 1148 |
{ |
1149 |
- int nb_frames, i, ret, resample_changed; |
|
1149 |
+ int nb_frames, i, ret, av_unused resample_changed; |
|
1150 | 1150 |
AVFrame *final_picture, *formatted_picture; |
1151 | 1151 |
AVCodecContext *enc, *dec; |
1152 | 1152 |
double sync_ipts; |
... | ... |
@@ -1193,6 +1193,7 @@ static void do_video_out(AVFormatContext *s, |
1193 | 1193 |
formatted_picture = in_picture; |
1194 | 1194 |
final_picture = formatted_picture; |
1195 | 1195 |
|
1196 |
+#if !CONFIG_AVFILTER |
|
1196 | 1197 |
resample_changed = ost->resample_width != dec->width || |
1197 | 1198 |
ost->resample_height != dec->height || |
1198 | 1199 |
ost->resample_pix_fmt != dec->pix_fmt; |
... | ... |
@@ -1208,7 +1209,6 @@ static void do_video_out(AVFormatContext *s, |
1208 | 1208 |
ost->resample_pix_fmt = dec->pix_fmt; |
1209 | 1209 |
} |
1210 | 1210 |
|
1211 |
-#if !CONFIG_AVFILTER |
|
1212 | 1211 |
ost->video_resample = dec->width != enc->width || |
1213 | 1212 |
dec->height != enc->height || |
1214 | 1213 |
dec->pix_fmt != enc->pix_fmt; |