ffmpeg/libavcodec
Michael Niedermayer 91e00c4a78 Merge commit '458446acfa1441d283dacf9e6e545beb083b8bb0'
* commit '458446acfa1441d283dacf9e6e545beb083b8bb0':
  lavc: Edge emulation with dst/src linesize

Conflicts:
	libavcodec/cavs.c
	libavcodec/h264.c
	libavcodec/hevc.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/rv34.c
	libavcodec/svq3.c
	libavcodec/vc1dec.c
	libavcodec/videodsp.h
	libavcodec/videodsp_template.c
	libavcodec/vp3.c
	libavcodec/vp8.c
	libavcodec/wmv2.c
	libavcodec/x86/videodsp.asm
	libavcodec/x86/videodsp_init.c

Changes to the asm are not merged, they are left for volunteers or
in their absence for later.
The changes this merge introduces are reordering of the function
arguments

See: face578d56c2d1375e40d5e2a28acc122132bc55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-15 15:07:10 +01:00
..
2013-10-23 14:32:04 +02:00
2013-10-30 11:04:06 +00:00
2013-10-28 08:33:21 -04:00
2013-05-10 16:10:51 -03:00
2013-10-30 11:04:06 +00:00
2013-10-03 23:00:09 +02:00
2013-09-04 16:37:25 +02:00
2013-08-13 15:45:08 +02:00
2013-08-13 15:45:08 +02:00
2013-10-30 23:56:52 +01:00
2013-10-31 20:19:59 +01:00
2013-09-25 16:30:25 +02:00
2013-10-15 17:00:28 +01:00
2013-04-25 14:21:00 +00:00
2013-10-06 20:12:37 +00:00
2013-10-08 12:40:33 +00:00
2013-08-13 15:45:08 +02:00
2013-10-15 23:58:20 +02:00
2013-10-18 16:46:08 +02:00
2013-04-20 00:05:35 +02:00
2013-10-15 22:13:02 +02:00
2013-10-13 21:48:28 +02:00
2013-10-28 23:54:28 +01:00
2013-11-03 01:00:16 +01:00
2013-08-07 21:13:12 +02:00
2013-08-12 19:40:29 +02:00
2013-10-30 12:41:43 +00:00
2013-09-21 16:59:13 +02:00
2013-08-26 19:26:01 +00:00
2013-11-05 13:19:30 +00:00
2013-11-05 13:19:30 +00:00
2013-07-28 22:27:36 +00:00
2013-08-09 23:02:48 +02:00
2013-10-28 23:54:28 +01:00
2013-09-21 16:59:13 +02:00
2013-07-10 12:07:53 +00:00
2013-07-10 12:07:53 +00:00
2013-07-10 12:07:53 +00:00
2013-10-22 19:55:47 +02:00
2013-11-05 12:44:20 +00:00
2013-05-28 13:56:29 +03:00
2013-04-15 12:32:05 +03:00
2013-10-02 21:03:11 -04:00
2013-10-30 11:04:06 +00:00