diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-06 13:23:05 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-06 13:45:08 +0200 |
commit | 55c49afc42abae64e5ab25e04bc3c09b17c5b6d5 (patch) | |
tree | 3e56007e0d3039ee6aa91e0e87b9abc14a49bf94 /libavfilter | |
parent | 886c3662d308e97316a606732574f0e87b1cbe3a (diff) | |
parent | d3a72becc6371563185a509b94f5daf32ddbb485 (diff) | |
download | ffmpeg-55c49afc42abae64e5ab25e04bc3c09b17c5b6d5.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
yuv4mpeg: return proper error codes.
Give all anonymously typedeffed structs in headers a name
fate: Add parseutils test
parseutils-test: Drop random colors from parsing test
vf_pad/scale: use double precision for aspect ratios.
build: error on variable-length arrays
ppc: swscale: rework yuv2planeX_altivec()
ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec()
x86: dsputil: kill VLA in gmc_mmx()
libspeexenc: Updated commentary to reflect recent changes
libspeexenc: Add an option for enabling DTX
doc/APIchanges: fill in missing dates and hashes.
lavr: bump major to 1 and declare it stable.
lavr: change the type of the data buffers to uint8_t**.
lavc: deprecate the audio resampling API.
Conflicts:
cmdutils.h
configure
doc/APIchanges
ffplay.c
libavcodec/dwt.h
libavcodec/libspeexenc.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavformat/asf.h
tests/fate/libavutil.mak
tests/ref/fate/parseutils
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/af_asyncts.c | 8 | ||||
-rw-r--r-- | libavfilter/af_resample.c | 6 | ||||
-rw-r--r-- | libavfilter/gradfun.h | 2 | ||||
-rw-r--r-- | libavfilter/vf_pad.c | 4 | ||||
-rw-r--r-- | libavfilter/vf_scale.c | 4 | ||||
-rw-r--r-- | libavfilter/yadif.h | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c index 18892d4826..41cb47565e 100644 --- a/libavfilter/af_asyncts.c +++ b/libavfilter/af_asyncts.c @@ -127,7 +127,7 @@ static int request_frame(AVFilterLink *link) nb_samples); if (!buf) return AVERROR(ENOMEM); - ret = avresample_convert(s->avr, (void**)buf->extended_data, + ret = avresample_convert(s->avr, buf->extended_data, buf->linesize[0], nb_samples, NULL, 0, 0); if (ret <= 0) { avfilter_unref_bufferp(&buf); @@ -143,7 +143,7 @@ static int request_frame(AVFilterLink *link) static int write_to_fifo(ASyncContext *s, AVFilterBufferRef *buf) { - int ret = avresample_convert(s->avr, NULL, 0, 0, (void**)buf->extended_data, + int ret = avresample_convert(s->avr, NULL, 0, 0, buf->extended_data, buf->linesize[0], buf->audio->nb_samples); avfilter_unref_buffer(buf); return ret; @@ -204,7 +204,7 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf) goto fail; } - avresample_read(s->avr, (void**)buf_out->extended_data, out_size); + avresample_read(s->avr, buf_out->extended_data, out_size); buf_out->pts = s->pts; if (delta > 0) { @@ -224,7 +224,7 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf) avresample_read(s->avr, NULL, avresample_available(s->avr)); s->pts = pts - avresample_get_delay(s->avr); - ret = avresample_convert(s->avr, NULL, 0, 0, (void**)buf->extended_data, + ret = avresample_convert(s->avr, NULL, 0, 0, buf->extended_data, buf->linesize[0], buf->audio->nb_samples); fail: diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c index eb2d2f9e21..c51f9d243b 100644 --- a/libavfilter/af_resample.c +++ b/libavfilter/af_resample.c @@ -149,7 +149,7 @@ static int request_frame(AVFilterLink *outlink) if (!buf) return AVERROR(ENOMEM); - ret = avresample_convert(s->avr, (void**)buf->extended_data, + ret = avresample_convert(s->avr, buf->extended_data, buf->linesize[0], nb_samples, NULL, 0, 0); if (ret <= 0) { @@ -186,9 +186,9 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf) goto fail; } - ret = avresample_convert(s->avr, (void**)buf_out->extended_data, + ret = avresample_convert(s->avr, buf_out->extended_data, buf_out->linesize[0], nb_samples, - (void**)buf->extended_data, buf->linesize[0], + buf->extended_data, buf->linesize[0], buf->audio->nb_samples); if (ret < 0) { avfilter_unref_buffer(buf_out); diff --git a/libavfilter/gradfun.h b/libavfilter/gradfun.h index 3ceb13397d..939b129aaa 100644 --- a/libavfilter/gradfun.h +++ b/libavfilter/gradfun.h @@ -25,7 +25,7 @@ #include "avfilter.h" /// Holds instance-specific information for gradfun. -typedef struct { +typedef struct GradFunContext { int thresh; ///< threshold for gradient algorithm int radius; ///< blur radius int chroma_w; ///< width of the chroma planes diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index 7d2ea92a7f..9918272924 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -126,9 +126,9 @@ static int config_input(AVFilterLink *inlink) var_values[VAR_IN_H] = var_values[VAR_IH] = inlink->h; var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN; var_values[VAR_OUT_H] = var_values[VAR_OH] = NAN; - var_values[VAR_A] = (float) inlink->w / inlink->h; + var_values[VAR_A] = (double) inlink->w / inlink->h; var_values[VAR_SAR] = inlink->sample_aspect_ratio.num ? - (float) inlink->sample_aspect_ratio.num / inlink->sample_aspect_ratio.den : 1; + (double) inlink->sample_aspect_ratio.num / inlink->sample_aspect_ratio.den : 1; var_values[VAR_DAR] = var_values[VAR_A] * var_values[VAR_SAR]; var_values[VAR_HSUB] = 1 << pad->draw.hsub_max; var_values[VAR_VSUB] = 1 << pad->draw.vsub_max; diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 49988bfbd8..c7cbdfe2c8 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -172,9 +172,9 @@ static int config_props(AVFilterLink *outlink) var_values[VAR_IN_H] = var_values[VAR_IH] = inlink->h; var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN; var_values[VAR_OUT_H] = var_values[VAR_OH] = NAN; - var_values[VAR_A] = (float) inlink->w / inlink->h; + var_values[VAR_A] = (double) inlink->w / inlink->h; var_values[VAR_SAR] = inlink->sample_aspect_ratio.num ? - (float) inlink->sample_aspect_ratio.num / inlink->sample_aspect_ratio.den : 1; + (double) inlink->sample_aspect_ratio.num / inlink->sample_aspect_ratio.den : 1; var_values[VAR_DAR] = var_values[VAR_A] * var_values[VAR_SAR]; var_values[VAR_HSUB] = 1<<av_pix_fmt_descriptors[inlink->format].log2_chroma_w; var_values[VAR_VSUB] = 1<<av_pix_fmt_descriptors[inlink->format].log2_chroma_h; diff --git a/libavfilter/yadif.h b/libavfilter/yadif.h index 45bb1dc8ee..41691de65d 100644 --- a/libavfilter/yadif.h +++ b/libavfilter/yadif.h @@ -22,7 +22,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" -typedef struct { +typedef struct YADIFContext { /** * 0: send 1 frame for each frame * 1: send 1 frame for each field |