diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 14:22:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 14:22:58 +0100 |
| commit | 0ecfcf862136d1c7b190415826c0521a52e790fb (patch) | |
| tree | 579a5fd539937536b401345471e40d68870b25f2 /ffplay.c | |
| parent | 9f8e2e92ae88841709ae1ffe71572ef7e5e865c7 (diff) | |
| parent | e2718e7a7006908d7fb9bb003a92f28d58fa6e21 (diff) | |
| download | ffmpeg-0ecfcf862136d1c7b190415826c0521a52e790fb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* 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>
Diffstat (limited to 'ffplay.c')
| -rw-r--r-- | ffplay.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -90,7 +90,7 @@ const int program_birth_year = 2003; /* TODO: We assume that a decoded and resampled frame fits into this buffer */ #define SAMPLE_ARRAY_SIZE (8 * 65536) -static int sws_flags = SWS_BICUBIC; +static int64_t sws_flags = SWS_BICUBIC; typedef struct MyAVPacketList { AVPacket pkt; @@ -1582,7 +1582,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts1, int64_ av_picture_copy(&pict, (AVPicture *)src_frame, src_frame->format, vp->width, vp->height); #else - sws_flags = av_get_int(sws_opts, "sws_flags", NULL); + av_opt_get_int(sws_opts, "sws_flags", 0, &sws_flags); is->img_convert_ctx = sws_getCachedContext(is->img_convert_ctx, vp->width, vp->height, src_frame->format, vp->width, vp->height, AV_PIX_FMT_YUV420P, sws_flags, NULL, NULL, NULL); @@ -1732,7 +1732,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c if (!buffersink_params) return AVERROR(ENOMEM); - snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags); + snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%"PRId64, sws_flags); graph->scale_sws_opts = av_strdup(sws_flags_str); snprintf(buffersrc_args, sizeof(buffersrc_args), |