1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Files
FFmpeg/libavcodec
Michael Niedermayer 3d04117078 Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'
* commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094':
  error_resilience: move the MECmpContext initialization into ER code

Conflicts:
	libavcodec/error_resilience.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 14:56:52 +01:00
..
2015-01-25 18:20:43 -03:00
2014-11-13 19:01:08 +01:00
2014-12-18 16:10:23 +01:00
2014-11-30 12:56:02 +01:00
2015-01-07 19:46:16 +01:00
2015-01-27 12:37:34 +01:00
2015-01-09 20:33:53 +01:00
2014-12-18 23:27:14 +01:00
2014-11-14 20:25:02 +01:00
2014-11-21 17:13:56 +01:00
2015-01-05 01:45:49 +01:00
2014-12-08 13:29:18 +00:00
2015-01-27 12:37:34 +01:00
2014-11-26 04:11:16 +01:00
2015-01-27 12:37:34 +01:00
2014-11-25 02:00:06 +00:00
2015-01-27 12:37:34 +01:00
2015-01-17 13:01:26 +01:00
2015-01-15 01:25:16 +01:00
2014-12-20 11:29:19 +01:00
2014-12-20 11:29:19 +01:00
2015-01-22 01:47:54 +01:00
2014-12-03 11:56:22 +01:00
2015-01-22 01:33:05 +01:00
2015-01-22 01:49:04 +01:00
2015-01-22 01:49:04 +01:00
2014-12-18 23:51:07 +01:00
2015-01-13 17:27:45 +01:00
2015-01-11 12:15:03 +01:00
2014-11-16 23:48:38 +01:00
2015-01-05 01:45:49 +01:00
2014-11-25 02:00:27 +01:00
2015-01-20 01:16:25 +01:00
2014-12-19 20:53:53 +01:00
2015-01-18 00:34:19 +01:00
2015-01-19 17:12:09 +01:00