Michael Niedermayer
5eb1704d5f
Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942'
* commit '064698d381e1e7790f21b0199a8930ea04e2e942':
Add HEVC decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/hevc.c
libavcodec/hevc.h
libavcodec/hevc_cabac.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c
libavcodec/hevc_parser.c
libavcodec/hevc_ps.c
libavcodec/hevc_refs.c
libavcodec/hevc_sei.c
libavcodec/hevcdsp.c
libavcodec/hevcdsp_template.c
libavcodec/hevcpred.c
libavcodec/hevcpred_template.c
libavcodec/version.h
cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 17:13:00 +01:00
..
2012-10-08 11:22:42 +02:00
2013-10-30 14:37:58 +01:00
2013-11-01 12:59:08 +01:00
2012-12-19 09:33:43 +01:00
2011-05-11 13:43:30 +02:00
2013-07-17 09:31:02 +02:00
2012-02-09 12:26:45 +01:00
2013-10-29 18:30:27 +01:00
2013-09-02 01:19:52 +02:00
2013-10-09 04:01:46 +02:00
2013-09-29 16:36:25 +00:00
2013-10-19 15:20:03 +02:00
2013-04-05 10:11:57 +02:00
2012-11-02 18:28:56 +01:00
2013-08-12 03:27:26 +02:00
2013-11-01 12:51:39 +01:00
2011-12-21 19:59:45 +01:00
2013-09-29 23:31:12 +02:00
2013-05-29 11:19:25 +02:00
2013-07-28 14:21:11 +02:00
2012-12-19 09:33:44 +01:00
2013-04-05 10:11:57 +02:00
2013-04-05 10:11:57 +02:00
2012-12-19 09:33:44 +01:00
2013-04-05 10:11:57 +02:00
2012-12-19 09:33:44 +01:00
2013-08-12 03:27:26 +02:00
2013-08-12 03:27:26 +02:00
2013-04-12 18:21:57 +02:00
2013-10-14 23:08:52 +02:00
2012-01-28 11:04:19 +01:00
2013-10-26 12:23:54 +02:00
2013-09-19 10:10:30 +02:00
2013-10-03 09:19:38 +02:00
2012-11-16 13:07:10 +01:00
2013-09-10 18:04:03 +02:00
2013-10-27 09:18:45 +01:00
2013-08-12 19:40:29 +02:00
2013-10-31 13:36:57 +00:00
2013-09-17 19:47:58 +02:00
2013-11-01 17:13:00 +01:00
2012-11-11 20:43:28 +01:00
2011-11-23 23:03:37 +01:00
2013-10-18 23:26:55 +02:00
2013-10-26 11:29:42 +02:00
2012-12-19 09:33:44 +01:00
2012-12-19 09:33:44 +01:00
2012-12-19 09:33:44 +01:00
2012-12-19 09:33:44 +01:00
2013-04-12 18:21:57 +02:00
2013-08-12 03:27:26 +02:00
2012-12-19 09:33:44 +01:00
2013-10-24 21:19:52 +02:00
2013-06-11 01:07:16 +02:00
2013-08-04 14:01:41 +02:00
2013-03-12 03:23:28 +01:00
2013-10-29 18:30:27 +01:00
2013-01-06 16:30:02 +01:00
2013-01-23 17:44:56 +01:00
2013-10-24 08:16:17 +02:00
2013-06-25 10:46:52 +02:00
2013-08-30 15:47:38 +00:00
2013-10-27 12:44:48 +01:00
2012-12-21 00:18:34 +01:00
2013-10-28 01:13:46 +01:00
2013-10-25 15:44:12 +02:00
2013-09-30 16:54:46 +02:00
2013-08-29 22:52:04 +02:00
2011-12-12 01:25:37 +01:00
2013-02-14 23:45:48 +01:00
2012-10-31 00:37:42 +01:00
2013-10-09 04:01:46 +02:00
2010-06-27 14:31:50 +00:00
2013-03-30 16:58:45 +01:00
2013-10-25 15:44:04 +02:00
2012-12-21 00:18:34 +01:00