1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
Michael Niedermayer 756dc7bd18 Merge commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87'
* commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87':
  h264: split weighted pred-related vars into per-slice context

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_mb.c
	libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21 13:13:12 +01:00
..
2015-03-06 14:37:44 +01:00
2015-03-20 02:38:20 -03:00
2015-03-10 23:33:57 +01:00
2015-03-03 13:57:42 +01:00
2015-03-03 13:57:42 +01:00
2015-02-21 20:41:36 +01:00
2015-02-21 20:38:13 +01:00
2015-03-20 00:25:50 +01:00
2015-02-06 19:07:29 +01:00
2015-02-05 09:48:54 +00:00
2015-02-08 00:12:46 +01:00
2015-02-14 19:45:23 +00:00
2015-03-14 14:05:25 +01:00
2015-02-10 14:20:32 +00:00
2015-03-02 19:32:23 +01:00
2015-02-27 09:30:13 +00:00
2015-03-20 02:17:31 +01:00
2015-02-18 10:21:56 -05:00
2015-03-20 00:25:50 +01:00
2015-02-24 03:15:42 +01:00
2015-03-16 13:04:47 +01:00
2015-02-06 21:02:08 +01:00
2015-03-15 02:57:24 +01:00
2015-02-14 12:48:41 +00:00