Michael Niedermayer
fb61ed1e9f
Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'
* commit 'ac4b32df71bd932838043a4838b86d11e169707f':
On2 VP7 decoder
Conflicts:
Changelog
libavcodec/arm/h264pred_init_arm.c
libavcodec/arm/vp8dsp.h
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/arm/vp8dsp_init_armv6.c
libavcodec/arm/vp8dsp_init_neon.c
libavcodec/avcodec.h
libavcodec/h264pred.c
libavcodec/version.h
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c
libavcodec/vp8dsp.h
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/vp8dsp_init.c
See: 89f2f5dbd7a23e7ec1073d3c08d46093a01a4135 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04 14:46:10 +02:00
..
2012-12-08 14:19:55 +01:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-12-09 04:12:40 +01:00
2013-12-09 04:12:40 +01:00
2014-03-15 01:08:45 +01:00
2014-02-28 21:41:19 +01:00
2014-02-28 21:52:25 +01:00
2014-02-28 21:52:25 +01:00
2014-02-28 18:14:12 +01:00
2014-03-20 22:06:01 +01:00
2014-01-08 05:36:56 +01:00
2013-04-19 23:19:08 +03:00
2014-03-20 22:06:01 +01:00
2014-03-20 22:06:01 +01:00
2014-03-20 22:36:40 +01:00
2014-03-20 22:06:01 +01:00
2013-12-09 04:12:40 +01:00
2014-01-07 13:10:56 +01:00
2014-03-14 14:28:28 +01:00
2013-08-29 16:00:45 +02:00
2012-07-01 22:43:09 +02:00
2013-07-22 12:05:39 +02:00
2012-09-16 14:55:00 +02:00
2014-02-13 21:00:32 +01:00
2013-08-29 16:10:39 +02:00
2014-02-08 00:48:26 +01:00
2013-08-29 16:10:39 +02:00
2013-08-29 16:10:39 +02:00
2013-02-07 13:09:35 +01:00
2013-12-20 23:33:15 +01:00
2014-01-04 13:19:54 +01:00
2014-01-08 05:13:25 +01:00
2013-01-24 15:47:47 +01:00
2014-02-08 00:48:26 +01:00
2014-04-04 14:46:10 +02:00
2013-03-13 14:18:53 +01:00
2013-01-24 15:47:47 +01:00
2014-01-14 14:38:10 +01:00
2014-03-13 23:59:56 +01:00
2014-03-09 01:16:21 +01:00
2014-03-22 22:53:33 +01:00
2013-04-20 14:19:08 +02:00
2013-04-20 14:19:08 +02:00
2013-04-19 23:19:08 +03:00
2014-02-13 02:20:08 +01:00
2013-01-22 18:32:56 -08:00
2014-04-04 14:46:10 +02:00
2012-12-08 14:19:55 +01:00
2013-08-30 15:47:38 +00:00
2014-02-08 00:48:26 +01:00
2013-07-22 14:48:30 +03:00
2014-03-26 20:50:05 +01:00
2014-03-26 21:23:09 +01:00
2014-03-26 21:23:09 +01:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-02-26 13:05:10 +01:00
2014-01-14 14:38:10 +01:00
2012-08-01 23:33:06 +02:00
2013-02-26 13:05:10 +01:00
2014-02-08 00:48:26 +01:00
2013-08-30 15:47:38 +00:00
2014-01-11 03:08:10 +01:00
2012-10-03 13:35:02 +02:00
2013-02-07 13:35:49 +01:00
2013-08-30 15:47:38 +00:00
2013-05-01 18:21:35 +02:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2014-01-04 13:13:39 +01:00
2012-08-01 23:33:06 +02:00
2013-01-23 17:44:56 +01:00
2013-01-23 17:44:56 +01:00
2012-10-03 13:35:02 +02:00
2013-07-22 14:48:30 +03:00
2013-12-20 23:12:16 +01:00
2013-12-20 23:33:15 +01:00
2013-12-20 23:12:16 +01:00
2013-12-20 23:12:16 +01:00
2012-12-22 00:58:08 +01:00
2014-03-13 23:59:56 +01:00
2013-02-06 13:27:24 +01:00
2013-02-06 13:27:24 +01:00
2013-02-06 13:27:24 +01:00
2013-01-20 14:13:16 +01:00
2014-03-09 13:06:31 +01:00
2014-01-08 05:44:56 +01:00
2013-08-24 11:04:11 +02:00
2013-08-24 11:04:11 +02:00
2012-09-21 14:44:32 +02:00
2014-03-25 13:29:05 +01:00
2014-03-12 22:03:00 +01:00
2014-04-04 14:46:10 +02:00
2014-04-04 14:46:10 +02:00
2014-04-04 14:46:10 +02:00
2014-02-06 15:33:54 +01:00
2014-04-04 14:46:10 +02:00
2012-12-08 14:19:55 +01:00