1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
Michael Niedermayer cd6f5c4895 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>
2012-10-10 14:07:05 +02:00
..
2012-08-30 05:17:24 +02:00
2012-10-09 08:59:09 +00:00
2012-09-28 02:40:53 +02:00
2012-08-18 17:45:58 +02:00
2012-10-07 17:57:13 +00:00
2012-09-08 02:28:20 +02:00
2012-10-08 09:03:19 +02:00
2012-10-08 09:03:19 +02:00
2012-10-09 22:12:34 +02:00
2012-10-07 03:20:36 +02:00
2012-09-20 22:00:52 +02:00
2012-09-16 14:37:50 +02:00
2012-08-27 05:23:42 +02:00
2012-10-07 23:31:27 +02:00
2012-09-01 23:45:32 +02:00
2012-09-23 02:12:34 +02:00
2012-08-28 22:29:20 +02:00
2012-09-15 22:13:21 +02:00
2012-08-29 00:05:03 +02:00
2012-10-09 08:59:09 +00:00
2012-09-23 01:22:16 +02:00
2012-09-23 15:24:08 +02:00