1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavcodec
Michael Niedermayer 8ee7b3881b Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec'
* commit '44e065d56c87d6a9d0effccec5f31517f72924ec':
  vdpau: Add context and common helpers for hwaccel support

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/vdpau.h
	libavcodec/version.h

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