diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:04:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:07:05 +0200 |
| commit | cd6f5c4895c49b483542030324ea5198521ab28b (patch) | |
| tree | c1ae5a95d3b19de827e98270ff060124086c4414 /libavfilter | |
| parent | b7ebb49d035205bcfbcc4f1788df5ba1419fadc8 (diff) | |
| parent | 6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702 (diff) | |
| download | ffmpeg-cd6f5c4895c49b483542030324ea5198521ab28b.tar.gz | |
Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702'
* commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702':
swscale: Do not make ff_ symbols globally visible.
rtspdec: use av_strlcpy for writing into fixed size buffer
g722enc: fix size argument in memset
http: use av_strlcpy instead of strcpy() without size checks
avfilter: correct memcpy size avfilter_copy_buf_props()
lavc: split asv12 encoder/decoder
Conflicts:
libavcodec/asvdec.c
libavfilter/buffer.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avcodec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/avcodec.c b/libavfilter/avcodec.c index a0f8b69a8d..313080dc01 100644 --- a/libavfilter/avcodec.c +++ b/libavfilter/avcodec.c @@ -142,7 +142,7 @@ int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src) if (!dst->extended_data) return AVERROR(ENOMEM); memcpy(dst->extended_data, src->extended_data, - planes * sizeof(dst->extended_data)); + planes * sizeof(*dst->extended_data)); } else dst->extended_data = dst->data; dst->nb_samples = src->audio->nb_samples; |