* qatar/master:
avplay: Do not use removed av_get_int()
avconv: fix variable shadowing in configure_input_audio_filter()
Conflicts:
ffmpeg_filter.c
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
... | ... |
@@ -90,7 +90,7 @@ const int program_birth_year = 2003; |
90 | 90 |
/* TODO: We assume that a decoded and resampled frame fits into this buffer */ |
91 | 91 |
#define SAMPLE_ARRAY_SIZE (8 * 65536) |
92 | 92 |
|
93 |
-static int sws_flags = SWS_BICUBIC; |
|
93 |
+static int64_t sws_flags = SWS_BICUBIC; |
|
94 | 94 |
|
95 | 95 |
typedef struct MyAVPacketList { |
96 | 96 |
AVPacket pkt; |
... | ... |
@@ -1582,7 +1582,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts1, int64_ |
1582 | 1582 |
av_picture_copy(&pict, (AVPicture *)src_frame, |
1583 | 1583 |
src_frame->format, vp->width, vp->height); |
1584 | 1584 |
#else |
1585 |
- sws_flags = av_get_int(sws_opts, "sws_flags", NULL); |
|
1585 |
+ av_opt_get_int(sws_opts, "sws_flags", 0, &sws_flags); |
|
1586 | 1586 |
is->img_convert_ctx = sws_getCachedContext(is->img_convert_ctx, |
1587 | 1587 |
vp->width, vp->height, src_frame->format, vp->width, vp->height, |
1588 | 1588 |
AV_PIX_FMT_YUV420P, sws_flags, NULL, NULL, NULL); |
... | ... |
@@ -1732,7 +1732,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c |
1732 | 1732 |
if (!buffersink_params) |
1733 | 1733 |
return AVERROR(ENOMEM); |
1734 | 1734 |
|
1735 |
- snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags); |
|
1735 |
+ snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%"PRId64, sws_flags); |
|
1736 | 1736 |
graph->scale_sws_opts = av_strdup(sws_flags_str); |
1737 | 1737 |
|
1738 | 1738 |
snprintf(buffersrc_args, sizeof(buffersrc_args), |