diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 16:04:03 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 16:07:05 +0400 |
commit | cd6f5c4895c49b483542030324ea5198521ab28b (patch) | |
tree | c1ae5a95d3b19de827e98270ff060124086c4414 /libswscale | |
parent | b7ebb49d035205bcfbcc4f1788df5ba1419fadc8 (diff) | |
parent | 6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702 (diff) |
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 'libswscale')
-rw-r--r-- | libswscale/libswscale.v | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/libswscale.v b/libswscale/libswscale.v index c68f153cbc..8b9a96ae66 100644 --- a/libswscale/libswscale.v +++ b/libswscale/libswscale.v @@ -1,4 +1,4 @@ LIBSWSCALE_$MAJOR { - global: swscale_*; sws_*; ff_*; + global: swscale_*; sws_*; local: *; }; |