• Michael Niedermayer's avatar
    Merge commit '6d0beefb' · cd6f5c48
    Michael Niedermayer authored
    * commit '6d0beefb':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    cd6f5c48
asvenc.c 9.01 KB