Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Oct 2012 12:04:03 +0000 (14:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Oct 2012 12:07:05 +0000 (14:07 +0200)
commitcd6f5c4895c49b483542030324ea5198521ab28b
treec1ae5a95d3b19de827e98270ff060124086c4414
parentb7ebb49d035205bcfbcc4f1788df5ba1419fadc8
parent6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702
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>
libavcodec/Makefile
libavcodec/asv.c
libavcodec/asv.h
libavcodec/asvdec.c
libavcodec/asvenc.c
libavcodec/g722enc.c
libavfilter/avcodec.c
libavformat/http.c
libavformat/rtspdec.c